finally compiles
Merge branch 'AJDev' of https://github.com/ajk1311/EECS494 into AJDev