Minor changes. nothing works
Merge branch 'master' of https://github.com/dcastil1983/cs153_project