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

Conflicts:
	app/views/articles/show.html.erb
	app/views/comments/_comment.html.erb