No website content
No website images
Merge branch 'master' into gh-pages

Conflicts:
	ambience.html
	index.html