initial commit

started adding game functionality
Merge branch 'master' into gh-pages