making note but error
Merge branch 'master' of https://github.com/KimHyeMin/judge into KimHyeMin-master

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
Merge branch 'KimHyeMin-master'