lol
Merge branch 'master' of https://github.com/KTH-Projekt-iVote/KTH-Voteing

Conflicts:
	iVoteMVC/iVoteMVC/Controllers/AnswerController.cs