Docs
Merge branch 'master' of https://github.com/ejpmateus/conillon

Conflicts:
	dist/BaseClient.jar
	dist/CodeServer.jar
	dist/MasterServer.jar