for heroku to work with assets pipeline
Merge branch 'master' of https://github.com/Ephasme/blogmarion