Merge branch 'master' of https://github.com/theDazzler/4483b_game_demo

Conflicts:
	Assets/scripts/GameController.cs