add generated demo files to gitignore for master branch (to see generated files, see the gh-pages branch)
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore