Merge pull request #3 from oconn/calendar

Calendar
last commit on thursday
added some links
Merge pull request #4 from oconn/views

Views
add form to nav bar