Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/example/a09_blauzahn/MainActivity.java
added main activity layout for landscape
git takes getting used to
Merge remote-tracking branch 'origin/master'