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

Conflicts:
	db/schema.rb
Normalize all the line endings