defprompt parsing
added comment state
blergh
Merge branch 'master' of https://github.com/Mmbitz/CS485Project