update from master
Merge branch 'master' into gh-pages

Conflicts:
	src/Game.js
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Credits in footer at bottom