button visable
Merge branch 'master' of https://github.com/allimenke/castledrama

Conflicts:
	game.js
Merge branch 'master' of https://github.com/allimenke/castledrama