ignore html/
merge 002-version-from-tags
Merge branch 'master' into 002-version-from-tags

Conflicts:
	.gitignore