rettet lidt det hele
rettet lidt mere
bibtex merged
Merge branch 'develop' of https://github.com/figa12/sw606f13 into develop