short sections
Merge branch 'master' of https://github.com/jeffreyyoung/track-my-fitness

Conflicts:
	instructor/index2.html
	instructor/sectionsummary.html