updated looks for 2 activities

select_exercise
workout_in_progress
Merge remote-tracking branch 'origin/master'

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