Version 1.0
Version 1.5
Merge branch 'master' into gh-pages

Conflicts:
	index.html