I'm about to Commit myself
Merge branch 'master' of https://github.com/AmoryWri/CS192_Teamwork