Fixes for marquee
Merge branch 'master' of github.com:iaincollins/newshack

Conflicts:
	css/common.css
	js/map_generator.js
Reordered items on the sidebar