homepage
cname
favicon
html head
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Fix conflict
Fix sidebar ad
Fix things
Fix root link
Fix css
Update background image
Not fixing css
Fix header
Fix header
Add padding to content