Hello world
Merge branch 'master' into develop

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/application.rb
	config/initializers/session_store.rb
	config/secrets.yml