Before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/home_controller.rb
	app/views/home/index.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/home_controller.rb
Before deploy comming soon