update gitignore
Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
Including markdown figures again
Merge branch 'gh-pages'

Conflicts:
	.gitignore