WORKOUTS ARE FUCKING DONE OMG FUCKING GODDAMN FINALLY!!!!!!!!!!!!!
Merge branch 'master' of github.com:NateBarnes/hashiru

Conflicts:
	app/models/workout.rb