full version
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/raw/input
	src/com/aistudio/balda/MainActivity.java