Änderung 2
Merge branch 'master' of https://github.com/sunpascal/git_test.git

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