Finish Hotfix-0.1.1
...
Finish Hotfix-0.1.2

Conflicts:
	index.html