update
Merge remote-tracking branch 'origin/master'

Conflicts:
	release/game.cpp
Merge branch 'master' of https://github.com/irbowen/EECS481_MDE