commit git method 5.
commit git method 7.
commit git method 8.
Merge branch 'develop'

Conflicts:
	src/com/example/AndroidGitDemo/MyActivity.java
retest git commit 5.