homework 3
Merge branch 'master' of https://github.com/spc348/game_dev_class