Merged calendar updates, template formatting updates, README formatting update
Merge pull request #14 from suetingc/template

Merged calendar updates, template formatting updates, README formatting ...