initial project version
test
Merge https://github.com/yngvilfk/fys3150_p1