Iteration 2 - Phil2(omstrukturering)
Merge remote-tracking branch 'origin/Iteration2' into Iteration2