inventory close
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	css/maze.css
	js/maze.js
Swamp added (player stuck in swamp for one turn).