Temporal
Merge branch 'master' of https://github.com/nyssy/blame

Conflicts:
	Gemfile.lock
	app/controllers/home_page_controller.rb
	app/views/home_page/main.html.erb
	config/routes.rb
	spec/requests/auth_logins_spec.rb
synchronized