Fixed conyogram
Take 5
Ran conyo.cup to generate new Parser
Random fix
Fixed some stuff locally (Evan)
So I can sleep
Merge pull request #7 from Vandenn/master

Pull