Fixed issues with slick and maven
Fixed issues with slick and maven
Fixed merge conflict
Merge branch 'master' of https://github.com/Kuxe/oopprojekt