Vet ikke hva titel gjør men det er gøy :D :D
Merge branch 'master' of github.com:gaymer/Gaymer2.0
Merge branch 'master' of github.com:gaymer/Gaymer2.0

Conflicts:
	MasterPage.master
Merge branch 'master' of github.com:gaymer/Gaymer2.0
10hi
Merge branch 'master' of github.com:gaymer/Gaymer2.0