Merge pull request #1 from pixzel/Behzad-Z

markensgate v 1.2 [PHP-gruppeoppgave]
fix 1.2
Merge pull request #2 from pixzel/Jens-Holm

1