Merge branch 'master' of https://github.com/dranelol/CMPS427

Conflicts:
	Assets/Prefabs/Persistant/GameManager.prefab
	Assets/Prefabs/Persistant/MobaCamera.prefab