thumbnail page
art.css
changes
Merge branch 'master' into gh-pages

Conflicts:
	css/projects.css
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages