fix weird bullet points
fix merge conflict
Merge branch 'master' of github.com:felixmulder/datateknik-lth