Save Commit
Merge remote-tracking branch 'origin/Remi' into Eric

Conflicts:
	WorkoutLog/.classpath
	WorkoutLog/project.properties
Merge remote-tracking branch 'origin/Remi' into Eric
Ruhezeiten bei ExerciseSpecific
CountDownTimer as a Service
Version 2.0
Fixed Timer
drawerlogo
vorbereitung für merge
Merge remote-tracking branch 'origin/Eric' into Remi

Conflicts:
	WorkoutLog/.classpath
	WorkoutLog/res/drawable/weightlifter3.png