Update to match master
Merge branch 'gh-pages' of https://github.com/kharry5/resume into gh-pages

Conflicts:
	index.html