Fixed
Merge branch 'master' of https://github.com/frobic/TRPG

Conflicts:
	TRPG-HTLM/js/game.js