initial commit
Merge branch 'master' of github.com:gallettigr/calendario

Local repo merge