fix
Merge branch 'master' of https://github.com/Kite0301/codemate

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	bin/spring
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/routes.rb
	config/secrets.yml