calendar
git merge
git merge master
git merge -m "merging Dave's branch
git commit -m "merging Dave's branch"
Merge branch 'master' of https://github.com/loganwbrown/art_eventz
calendar mostly working