yu
Merge branch 'gh-pages' of https://github.com/quinhoffman/quinhoffman into gh-pages

Conflicts:
	linkcontact.css
	linkportfolio.css
	linkresume.css