Mandatory 3.
Merge branch 'master' of github.com:Fjoggs/inf4231