1.1.0

new layout
Merge branch 'master' of https://github.com/tishoy/tishoy.github.io

Conflicts:
	game/index.html