redesign site
change logo
:Merge branch 'master' of https://github.com/oliviert/hackuci.com into oliviert-master

Conflicts:
	css/layout.css
	index.html
merging