replacing shitty parser
Merge branch 'master' of https://github.com/calvinhu4/coms4115_cal
parse fix