Merge branch 'gh-pages' of https://github.com/weskerdesign/Wesker-Site into gh-pages

Conflicts:
	_includes/contact.html
	work/proj-1.md
	work/proj-2.md