make the blocks transparent so conflicts are visible. moved title to bottom so conflicts are visible
reformatted labels so conflicts are clearly visible
Merge branch 'master' of github.com:hkloom/calendar_site