Merged duplicate copy
Merge https://github.com/jamesterjim/testgame

Conflicts:
	package.json
fixed formatting