stuff
Merge branch 'master' of https://github.com/atp10mla/project_network_programming

Conflicts:
	src/server/Monitor.java
	src/server/Player.java
	src/server/Server.java
Merge branch 'master' of https://github.com/atp10mla/project_network_programming
merged