uppg6 completed + cleanup
Merge branch 'master' of https://github.com/apals/numme