Merge commit 'e3c8620'

Conflicts:
	index.html
gitignore