minor parser changes
Merge branch 'master' of https://github.com/Torwegia/cs660
changes to parser file
Merge branch 'master' of https://github.com/Torwegia/cs660