remove yaml
fix merge conflicts
add FullCalendar js and css
Merge branch 'master' of https://github.com/oconn/Scheduler
Merge branch 'master' into calendar
Merge pull request #2 from oconn/views

Views
Merge branch 'master' of https://github.com/oconn/Scheduler into calendar
add links in navbar
Merge pull request #3 from oconn/calendar

Calendar
last commit on thursday