heroku
Merge branch 'master' of github.com:juliekraft/bludkin
merge issue
added cycle content inputs to calendar page in application html erb and also a little styling in style css