minor changes
Merge branch 'master' of https://github.com/awan1/cs97_final_project