heroku bookmarks
added carrierwave
added css to subscriptions and links to category_show
Merge branch 'subcss2' into dev