epfmseklfejf
Merge branch 'master' of https://github.com/asenval/BoronTeamProject

Conflicts:
	VotingSystem/VotingSystem.WebClient/Scripts/app.js
	VotingSystem/VotingSystem.WebClient/Scripts/app/persister.js
	VotingSystem/VotingSystem.WebClient/Scripts/app/view-models.js
	VotingSystem/VotingSystem.WebClient/Scripts/app/views.js
	VotingSystem/VotingSystem.WebClient/VotingSystem.WebClient.csproj