tested gameworld, corrected minor issues
solved stupid mergeconflict
Merge branch 'master' of https://github.com/Kuxe/oopprojekt