TestClass1-4
Merge branch 'test2' into test1

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