second merge of grace's and sam's code
Merge branch 'master' of https://github.com/gracebenz/Midd_Calendar

message3.