qq
q
q
q
q
q
q
q
q
q
Merge branch 'master' of https://github.com/ITBox/BabySay

Conflicts:
	app/bin/R.txt
	app/gen/cc/itbox/babysay/R.java
q