server
s

Conflicts:
	Project/workspace/MapYou/src/it/mapyou/controller/DeviceController.java
	Project/workspace/MapYou/src/it/mapyou/network/Server.java