Fixed bug
Merge branch 'master' of https://github.com/rhedshi/cs181-final-project.git