edited parser
Merge branch 'master' of github.com:benchisa/CS3202