first commit
Merge https://github.com/Lunarage/elevproj-ntnu