fixed merge conflicts
fixes master pull conflicts
sidebar almost done
minor code tweaks before pull
Merge branch 'development' of github.com:laurentqro/cantine into development
small changes to make branch match origin
Set up seed file
profile extended and updatable
Pass feed URL into 'feed_url' attribute rather than 'url'
Merge branch 'development' of github.com:laurentqro/cantine into development

Conflicts:
	app/views/feeds/index.html.haml
Set up Heroku
Set up Heroku (continued)
Edit Gemfile
can add subscription to feed, working code
fixed merge conflicts
changes to feeds index for development so that divs can be seen, fixed subscribe link logic
adds tagging to subscriptions and improvements to subscriptions index view
Heroku setup
Configure for deployment to Heroku
Precompile assets and bundle