Merge pull request #1 from co2meal/master

g
Merge pull request #1 from co2meal/master

asd
active_admin install
welcome page 만듦

ㅇㅇ
Merge pull request #5 from simmani91/master

make model notification and associate with user
Merge branch 'KimHyeMin-master'

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/algedian/judge into algedian-master

Conflicts:
	config/routes.rb
Merge branch 'algedian-master'
태

태
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
Merge pull request #6 from nona1314/master

태그 머지함 ㅎ
Merge pull request #2 from co2meal/master

Merge pull request #6 from nona1314/master
Merge pull request #1 from co2meal/master

gg
active admin css clear
admin - Problem add
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