fixed som stuff
merged
Merge branch 'master' of https://github.com/TSEA56-2014-Grupp-1/Dokumentation