Final commit of the project

Cleaned up stuff
Merge branch 'Production' of https://github.com/sebisges/EECS678Project1 into Production