upload
Merge https://github.com/petterhj/inf1010