initial import
Merge branch 'master' of github.com:andyhawthorne/ci_calendar

Merge from Github
Merge branch 'master' of github.com:andyhawthorne/ci_calendar