- WIP asteroides
Merge branch 'master' of https://github.com/fernando-barajas/asteroides

Conflicts:
	.gitignore