Tweaks to the parser
Fixed merge conflict in parser
Merge branch 'master' of https://github.com/StefanKopieczek/Earfuck