Game logic updates
Merge branch 'master' of https://github.com/vidurananayakkara/omimenia
Resolving conflicts