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

Conflicts:
	Wybory/src/main/java/MainServer/MainServerApp.java
testujmy z rozmachem
Merge branch 'master' of https://github.com/Prastaruszek/Wybory