integrate mamess info displaying
merge de la souffrance
mamess div adaptation
Merge branch 'master' of https://github.com/kasty/tvhackday

Conflicts:
	views/game.ejs