Test på konflikt
Merge branch 'master' of github.com:mhauken/Avgrund