More stuff
	modified:   js/hackday.js
	modified:   styles/default.css
Merge branch 'master' of https://github.com/abienz/Hackathon
More bad last minute hacky code
	modified:   js/hackday.js
	modified:   styles/default.css
	modified:   styles/scoreboard.css