Merge branch 'master' of https://github.com/Jerre1990/OGPWorms

Conflicts:
src/worms/model/World.java
No idea what I'm doing right now