fixade konflikt
Merge branch 'master' of https://github.com/klaseskilson/lithekoll