add logic
Merge branch 'master' into gameLogic