This is going to be my working copy...

So I can do whatever I want with it.
A note, and an update to remove a crash.

Temporarily redirected “My Calendar” menu item to calendar/index.
Added a note to clean up the _get_events_json function.
Merge branch 'master' of https://github.com/msherry24/lms299 into working-copy

Conflicts:
	models/dbcal.py
Merge branch 'working-copy'
Merge from working-copy after update from mdipierro/lms299.
Merge from working-copy after update from mdipierro/lms299.
Resolving conflicts between team master and my master.
Merge pull request #9 from bpatzke/master

Further work on the calendar API.