New exercice
New exercice
Merge branch 'master' of github.com:ChristianSchroedel/Study_Ohm-Hochschule

Conflicts:
	Android/Android_Programming/bin/classes/schroedel/de/androidprogramming/R$dimen.class
	Android_Programming/bin/AndroidProgramming.apk
	Android_Programming/bin/classes.dex