Changed index.html
Merge ssh://cloudcontrolled.com/repository

Conflicts:
	index.html
Changed Charset