Merge pull request #4 from co2meal/master

update
Merge remote-tracking branch 'upstream/master'
pagination

pagination
status pagination
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/layouts/application.html.erb
ad
i don kno
fix
Merge branch 'master' of https://github.com/nona1314/judge into nona1314-master

Conflicts:
	README.md
Merge branch 'nona1314-master'