Merge branch 'master' of https://github.com/mhoang83/TCSS491

Conflicts:
	Mario/game.js