un-jekyll
Merge branch 'gh-pages' of https://github.com/aromano272/Artists-Theme

Conflicts:
	form-success/index.html
	index.html
	work/proj-1/index.html
	work/proj-7/index.html
s