update
Merge branch 'master' of https://github.com/z3poxx/projektarbete2

Conflicts:
	Mvc_pazzunited/Controllers/PazzPokerController.cs
hj
hej
Merge branch 'master' of https://github.com/z3poxx/projektarbete2
update