First commit
Merge https://github.com/tnordenmark/lab2