So I didn't check out my branch...

Didn't really change anything except compiled it on my computer which
apparently changed some files. Should be the same.
screwing around with git
Merge branch 'master' of https://github.com/teamecho/Sketchtris

Conflicts:
	bin/Sketchtris.apk
	bin/classes.dex
	bin/resources.ap_