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 pull request #7 from bpatzke/master

Added json feed for calendar
-- Looks good, Bryan.  I'll have to make some adjustments to course_events, but I think your method is less hacky than what I had implemented.  I'll probably have a couple of questions for you in the near future.  Nice work.
Minor modifiactions to event_caledar
merging in from github master
course calendar select list added, edited query so that events for the selected section are shown
Merge branch 'master' of https://github.com/msherry24/lms299 into working-copy

Conflicts:
	models/dbcal.py
Merge branch 'working-copy'