some highlighting working on calendar
Merge branch 'master' of github.com:lisajwells/wdi_project_three
adding calendar with highlighting
Fixed merge conflicts