first modify
Merge branch 'master' of https://github.com/ningjia2013/test1

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