-Fixed some spacing, and I made the .o file
Merge branch 'master' of https://github.com/ryking4/CS4501

Conflicts:
	Parser.hs