Working on json feed.
Update from team master project.
This is going to be my working copy...

So I can do whatever I want with it.
Merge branch 'working-copy'

Added json feed for calendar events.
Added a general function that takes a query and a list of fields and
returns the results as a list of dictionaries suitable for passing
directly to the json function.
Added a sample view to show how the feed works.
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 'working-copy'

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
Layout bug fix: the code is wrapped in <h1> tags ( removed)
house cleaning
Teacher View: saving Final Grade and Grade Comment
Merge branch 'master' of https://github.com/msherry24/lms299 into working-copy

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

Create new event.
Update dbcal.py

requires URL() added
Update create_event.html

Create new event HTML view
Merge pull request #67 from matus85/master

Layout.html bug fix: the code is wrapped in <h1> tags ( removed)
Merge pull request #8 from Saher-/master

Update calendar.py
Looks great, Saher.  Merging it in. -Mike