Merge pull request #5 from math1man/parser

Parser
Merge branches 'master' and 'quests' of https://github.com/math1man/SuperMacalester into quests