Small changes to fix bugs
Merge branch 'master' of https://github.com/cbrant/final_project
Merge branch 'master' of https://github.com/cbrant/final_project
Commented code