message
Merge branch 'master' of https://github.com/jhoell1/eecs498_proj1
Kolya's changes to stuffff
Merge branch 'master' of https://github.com/jhoell1/eecs498_proj1