Added Exercise model for backend
Started writing out exercise router
Merge branch 'master' of https://github.com/TrackYourself/track-yourself into Excercise
Changed user set-up to match new implementation by Aisa
Exercise Module complete (first draft)
Completed html templates for Exercise Module
Fixed all spelling errors for exercise
File rename (spelling error)
Merge branch 'Excercise'

Conflicts:
	backend/models/Water.js