Updated schema to reflect starting point, IMPORTANT: Added dividers in views.py and urls.py to help avoid merge conflicts
Merge branch 'master' of https://github.com/katz12/justinthyme