directory changes
Merge branch 'master' of https://github.com/franciscojusto/domjudge

Conflicts:
	ulticoder-setup/install-ulticoder.sh