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

Conflicts:
	Assets/Prefabs/Persistant/GameManager.prefab
	Assets/Prefabs/Persistant/MobaCamera.prefab
Revert "Merge branch 'master' of https://github.com/dranelol/CMPS427"

This reverts commit 2050f5d554094a87f14ec2d5144028b1e6558e68.
u
bg
t
yea ok
merged