more lorem ipsum
Merge branch 'release-1.0' into dev

Conflicts:
	index.html