Show up

trying to launch the game!
Merge branch 'master' of https://github.com/jerop/jerop.github.io

Conflicts:
Revert 3f9517e..646630d

This rolls back to commit 3f9517eb96dab17f85edff461b3652b314c81ffd.
minor changes
Merge branch 'master' of https://github.com/jerop/jerop.github.io

Conflicts:
	index.html
	params.json
other changes

the game is gaining some shape