Edited introduction
Changed weirdo word
Fixed stupid merge-conflict
Merge branch 'master' of github.com:Thalmann/swf613-rapport