nic
nic
Merge branch 'master' of https://github.com/Prastaruszek/Wybory

Conflicts:
	Wybory/src/main/java/LocalServer/ServerThread.java
	Wybory/src/main/java/MainServer/MainServerApp.java