eerste commit
tweede commit
Merge branch 'master' of https://github.com/Xander1989/sample_app

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	spec/spec_helper.rb