Updated the parser and added a test script for it
Merge branch 'master' of https://github.com/hbrice/cis422