TRYING to make pretty
having a hard time prettifying
Merge branch 'master' into logDesign
Added stuff
Added API
Merge branch 'master' of https://github.com/CSc436/gymjournals into AddQueryWeightAPI
worked on fixing the styling
small change
more small stylistic changes
Fixed my API to use current weight
small changes to aerobic logging
Merge branch 'master' of https://github.com/CSc436/gymjournals into logDesign
Merge pull request #130 from CSc436/logDesign

Log design
Merge pull request #128 from CSc436/AddQueryWeightAPI

Add query weight api
Merge branch 'master' of https://github.com/CSc436/gymjournals into tagging

Conflicts:
	site/app/partials/_add_workout.html