change
Merge branch 'gh-pages' of https://github.com/michaelevy/personal into gh-pages

Conflicts:
	index.html