Add game logic to logic.js module and include from the main application file
Resolve merge conflict in index.js
Merge branch 'master' into winning-logic