fuckies
Merge branch 'master' of https://github.com/PeterAguiar/AlphaBuild-1 into PeterAguiar-master

Conflicts:
	Assets/Resources/Prefabs/Game Manager.prefab
Merge branch 'PeterAguiar-master'