Merge branch 'master' of /home/alexandr/IdeaProjects/VotingSystem with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/adduser_scene.fxml
	res/layout/signin_scene.fxml
	res/layout/votinglist_scene.fxml
Ura! fast !!!