done messing
Merge branch 'master' of https://github.com/Eliposin/PyramidPlunderGame

Conflicts:
	PyramidPlunder/PyramidPlunder/PyramidPlunder/Classes/GameManager.cs