Adding files and updated code
Merge branch 'master' of github.com:optional-is/calendaring