Added gitignore to gh-pages branch
Merge branch 'gh-pages' of https://github.com/ozagordi/shorah into gh-pages

Conflicts:
	.gitignore
Fixed typo