fix
fix
#1
Merge origin/master

Conflicts:
	index.html
#2