tried to dry out calendar controller
Merge branch 'master' of github.com:zealotjin/learn