Delete deploy.php
Delete divshot.json
Prettify html
Merge branch 'master' into gh-pages

Conflicts:
	about.html
	index.html
	news.html
	projects.html