documentation
Merge branch 'dev' of https://github.com/egenvall/projektht13 into dev