made some changes
Merge branch 'master' of https://github.com/alanrussian/cs314-class-project