change
Merge branch 'master' of github.com:ITBox/BabySay

Conflicts:
	app/bin/AndroidManifest.xml
	app/bin/R.txt