Started on issue #13, almost done
Merge branch 'master' of github.com:joakikr/inf5750