modify textview
Merge branch 'master' of https://github.com/russellmo/googlelearning.git

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