Fixed the last test in test_user.py failing.  Someone forgot to add '@pytest.mark.django_db' above the method header'
working calendar
removed some stuff from overview
Merge pull request #131 from CSc436/finalCalendar2

working calendar
Merge branch 'master' of https://github.com/CSc436/gymjournals into logDesign