Merge pull request #2 from co2meal/master

Merge pull request #6 from nona1314/master
active admin css clear
Merge pull request #8 from ydh0213/master

gdsga
temp
Merge pull request #7 from KimHyeMin/master

active admin css clear
Merge remote-tracking branch 'upstream/master'
problem show

problem show
Making submission...
Merge branch 'master' of https://github.com/co2meal/judge

Conflicts:
	db/schema.rb
Merge pull request #1 from co2meal/master

erwer
레이아웃 수정
add column to problems
Layout modify
Merge branch 'master' of https://github.com/algedian/judge
Merge pull request #10 from KimHyeMin/master

add column to problems
problem show.

show
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
Merge pull request #11 from algedian/master

layout modify
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
problem index link

link it