First commit!
remove files that end in ~
Merge branch 'master' of https://github.com/iseneirik/INF1080