fixed workout-detail and exercise-detail-name
Merge branch 'master' of https://github.com/leckster/cs256

Conflicts:
	main.js