init
pusher demo added
pusher demo added
pusher demo added 3
pusher demo added 3
pusher demo added 4
pusher demo added 5
Initial commit.
Merge https://github.com/gphrost/Risk

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/welcome.js.coffee
	app/assets/stylesheets/welcome.css.scss
	app/controllers/application_controller.rb
	app/controllers/welcome_controller.rb
	app/views/layouts/application.html.erb
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environments/development.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	public/robots.txt
	test/controllers/welcome_controller_test.rb
Initial commit.