Fixing some game logic that was broken
Merge branch 'master' of https://github.com/SpiderPigs/sidannarverkefni