NOt sure honestly
Merge conflict
Merge branch 'master' of github.com:foxor/LavaGame