Update index.html
Merge branch 'master' of https://github.com/ozanmora/test

Conflicts:
	index.html