some more test :D
Merge branch 'master' of https://github.com/daboooo/BigBrother

Conflicts:
	src/main/java/ia54Project/MainProgram.java
	src/main/java/ia54Project/RoleSender.java
	target/classes/.gitignore
	target/classes/ia54Project/MainProgram.class