Merge branch 'kevin'
Merge branch 'master' of https://github.com/ksolkowski/calendary