All the work
deleted the wrong index file
Merge branch 'stable-version' into gh-pages

Conflicts:
	.gitignore
	README.md