Primer commit
wqMerge https://github.com/jonaguera/asteroides

Conflicts:
	.gitignore