Bleh
Fixing conflict

Conflicts:
	fitness_app/app/views/routines/show.html.erb