Revert 27de5f1..418f1c5

This rolls back to commit 27de5f19383390098cdeec5341b262dfc00ed7bd.
Revert "Revert 27de5f1..418f1c5"

This reverts commit deba3433750b7ce6f0de20172430d627311789e3.
fixed random breaks
Merge branch 'test'
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave