some stuff

It won't fall :(
Merge branch 'master' of https://github.com/Eliposin/PyramidPlunderGame

Conflicts:

	PyramidPlunder/PyramidPlunder/PyramidPlunderContent/PyramidPlunderContent.contentproj