modified:   index.html
	modified:   js/hackday.js
	modified:   styles/default.css
Merge branch 'master' of https://github.com/abienz/Hackathon