added helper methods to calendar entries
not sure
merged conflicts
Merge branch 'master' of github.com:johntrandall/Project2