Laptop
zweiter commit
Merge branch 'master' of https://github.com/mst1903/Test.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/src/de/matze/test/MainActivity.java