type
Merge branch 'master' of https://github.com/mathildegui/bab

Conflicts:
	bin/bab.apk
	bin/classes.dex
	bin/classes/com/example/bab/MainActivity.class
	bin/resources.ap_
	src/com/example/bab/MainActivity.java