alex's changes
Merge branch 'master' of https://github.com/bradencanderson/CS118-Project2