I accidentally put two useless lines in setting page, now they are deleted.
Merge pull request #134 from CSc436/fixSetting

I accidentally put two useless lines in setting page, now they are deleted.
Merge branch 'master' into switchWeightChartBackToNVD3

Conflicts:
	site/app/partials/_settings.html
HTML in _settings partial was malformed

(tags weren't closed)
Merge branch 'switchWeightChartBackToNVD3' of https://github.com/CSc436/gymjournals into switchWeightChartBackToNVD3