prueba desde rama Some1
Merge branch 'master' of https://github.com/Some1uma/prueba

Conflicts:
	Cocos2DXnaGame/Game1.cs