I hate git
Merge branch 'master' of
https://github.com/jnysteen/FoersteAarsProjekt-V3.git
Frederik 12-02