custom pages commit
Merge https://github.com/joshkeen/repo1 into gh-pages

Conflicts:
	index.html
this is a message from the cli