Initial gh-pages branch
Add .gitignore
Merge remote-tracking branch 'andy/gh-pages' into gh-pages

Conflicts:
	index.html