Update MainActivity.java
Merge branch 'master' of https://github.com/kid-a-dev/hello3.git into
master2

Conflicts:
	src/com/example/hello3/MainActivity.java