Starting to stub out the game function
Resolving Merge conflicts.
Game functionality is complete. Need to work on design and layout.
Game is now functional
Solved Merge Conflicts
some js and a logo