Websockets and notifications
Merge branch 'websockets'

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/posts/index.html.haml
Logo
Merge branch 'master' of github.com:foxycoder/helaas

Conflicts:
	app/controllers/posts_controller.rb
	app/views/posts/index.html.haml