made some changes. dont remember what...
Merge branch 'master' of https://github.com/balvarez/app1

Conflicts:
	bin/classes.dex