Pre merge stuff
Merge conflict fixed
Merge fixed
Done the game class in JS, and some merge fixes...