intento
Merge branch 'master' of https://github.com/YolandaMojena/TheSphynx-sBloodyRevenge

Conflicts:
	Desktop/sphynx/TheSphynxsBloodyRevenge/src/Assets.as
	Desktop/sphynx/TheSphynxsBloodyRevenge/src/InGame.as