testing a change with git in message.py
Merge branch 'master' of https://github.com/csherland/cooperCalendar