Merge pull request #1 from VirtualSatai/Thomas

Fjernet r
Undøgt begin
Merge pull request #2 from VirtualSatai/Kasper

Undøgt begin
Makefile
herp derp