awesome
Merge branch 'master' of https://github.com/jhoell1/eecs498_proj1
stuff: