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

Conflicts:
	Mvc_pazzunited/Models/PazzUnited.edmx
	Mvc_pazzunited/Web.config