Publishing commit
Publish
Merge branch 'master' into gh-pages
Publish
Merge branch 'master' into gh-pages
Publish
Merge branch 'master' into gh-pages
Publish
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
Publish