Updated styles.
Updated Redactor
Merge branch 'master' of https://github.com/biola/news-publisher

Conflicts:
	app/views/articles/_form.html.slim
	app/views/articles/show.html.slim