Her mark og kasper!

Signed-off-by: umagar <tobias_kristiansen@hotmail.com>
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git