Calander update
Merge branch 'master' of https://github.com/mOcentury/PSD3_Sprint_2.git
Update Javascripts