Prøver lige igen..

Merge branch 'master' of
https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git