Merge pull request #1 from co2meal/master

g
Merge pull request #1 from co2meal/master

ggdgf
active_admin install
make model notification and associate with user
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