updated gitignore file
Merge branch 'gh-pages' into develop

Conflicts:
	.gitignore