working on calendar
Merge branch 'master' of https://github.com/cjacks0413/smith-music
merge fix