wonky calendar, model relations
Merge pull request #1 from ElizabethU/meetings

wonky calendar, model relations
merge conflict