Pre merge stuff
Merge conflict fixed
Merge fixed
Done the game class in JS, and some merge fixes...
Play and scores views updated
Merge fix
Merge fix
Play, scores view and tabs edit
Header login and play style
Fixed play view and game.js
Scores are now displayed on the page
gitignore update
.gitignore mod