WIP: add bootstrap. article carousel only rotates last article
Merge branch 'master' into article_carousel
fix typo in gem file
Merge branch 'master' into article_carousel

Conflicts:
	Gemfile.lock
	app/views/channels/show.html.erb