comments
Merge branch 'master' of https://github.com/khcr/neurones

Conflicts:
	app/assets/stylesheets/sitewide/blog.css.scss
	app/views/comments/success.js.erb
	app/views/comments/update.js.erb