init
Add css
Add logo
Merge branch 'master' into gh-pages

Conflicts:
	index.html
rm cname for now
Merge branch 'master' into gh-pages
reset cname