"Made some modifications."
Merge branch 'master' of https://github.com/sakoe/nintensity

Conflicts:
	nintensity/fitgoals/models.py
Making revisions to WorkoutType, readability revisions to code.