Delete site
Merge branch

Conflicts:
	css/global.css