lorem
Merge branch 'stylejg'

Conflicts:
	index.html