setup
Merge branch 'master' of https://github.com/TrimDich/trimm-dich.git

Conflicts:
	TrimmDich/res/values/strings.xml
	TrimmDich/src/de/lmu/msp/trimmdich/main/MainActivity.java
Merge branch 'master' of https://github.com/TrimDich/trimm-dich

Conflicts:
	TrimmDich/res/values/strings.xml
	TrimmDich/src/de/lmu/msp/trimmdich/main/MainActivity.java
asf
Merge branch 'master' of https://github.com/TrimDich/trimm-dich

Conflicts:
	TrimmDich/src/de/lmu/msp/trimmdich/exercise/ExerciseActivity.java