first commit
Merge branch 'master' of https://github.com/JSweetman/cs378-project
Merge branch 'master' of https://github.com/JSweetman/cs378-project
hooked to parse