fixed branch
Merge branch 'testbranch_fix'

Conflicts:
	GitTest/src/com/example/gittest/MainActivity.java