primeros pasos para implempoder tarjeta A1
Merge branch 'master' of https://github.com/Nibyru/pong

Conflicts:
	game.xml
	game.xml.bak