commit

comiited
Merge branch 'master' of https://github.com/turgood/gh into gh-pages

Conflicts:
	index.html