"autocommit"
"autocommit"
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
"autocommit"
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	.gitignore