git ignore
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
gitignore fix