change index.html
index.html
Merge branch 'master' of https://github.com/ricoliz/ricoliz.github.io

Conflicts:
	index.html