gh pages push
fixes
fixes
Merge branch 'gh-pages' of github.com:morriswchris/morriswchris.github.io into gh-pages
another fix
Merge branch 'gh-pages'

Conflicts:
	index.html
	js/custom.js