zzz
Merge branch 'master' of https://github.com/kid-a-dev/hello2.git

Conflicts:
	Test/src/com/example/test/MainActivity.java