Merge pull request #2 from co2meal/master

Merge pull request #6 from nona1314/master
Merge remote-tracking branch 'upstream/master'
problem show

problem show
problem show.

show
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
Merge pull request #9 from nona1314/master

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

Conflicts:
	db/schema.rb
Normalize all the line endings
Seed A + B problem in fixtures
Making Judge...
Judge Feature