The beast
Merge branch 'master' of https://github.com/vripoche/hackathon

Conflicts:
	css/styles.css