Fixes #3
WIP on issue #4 . Not working at all right now
WIP on issue #4 . Not working at all right now, see @TODOs
Merging master into gameengine + solving conflicts in game_engine.py