i co?
Merge branch 'master' of https://github.com/Prastaruszek/Wybory.git

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