bin
Merge branch 'master' of git://github.com/tenhsor1/Asteroides

Conflicts:
	bin/Asteroides.apk
	bin/resources.ap_