übungen bearbeitet
Merge branch 'master' of https://github.com/robin1501/LevelUpNew
übungen bearbeitet
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/uebungdetail.xml
Merge remote-tracking branch 'origin/master'