qzxcxzcxz
Merge branch 'master' of https://github.com/philipcass/gamecraft5

Conflicts:
	Assets/Scripts/GameController.cs