Added another test file along with fixing a ton of repr methods
At 95% code completion
100% code coverage.  Fixed issue with an AerobicExercise repr returning AerobicExercise object
fixed merge conflicts
Fixed the last test in test_user.py failing.  Someone forgot to add '@pytest.mark.django_db' above the method header'
Merge branch 'master' into switchWeightChartBackToNVD3