style
Merge commit 'a2259414449d47d97debd251381463932c453a8d'

Conflicts:
	app/src/main/res/layout/spielen_lernen.xml