Words now appear before and after
Merge branch 'master' of github.com:dcorwin/15237-project1

Conflicts:
	game.js