more reformatting, changed url
adding title:
Merge branch 'master' of github.com:hkloom/calendar_site