Pushing to master, I should be shot
Merge branch 'master' of github.com:OptimusCrime/fellesprosjekt-ntnu-gruppe53