reformat site
Merge remote-tracking branch 'origin/master'

Conflicts:
	continuous_scroll.html
	css/grayscale.css
	css/grayscale_cs.css
	css/grayscale_pages.css
	index.html
	portfolio.html