Fixed ugly emacs default indenting style.
Merge branch 'master' of https://github.com/Backhage/uppgift_6