initial
Merge branch 'master' of https://github.com/1um/ejudge-on-rails

Conflicts:
	.gitignore