gam205—week 13 logs

Monday done
Merge branch 'master' of https://github.com/TheDevilsWaffle/DigipenF14