Merge branch 'master' into gh-pages
new game pieces
Merge branch 'master' into gh-pages

Conflicts:
	resources/style.css