update index
Merge branch 'master' of https://github.com/ttomm/hello-world

Conflicts:
	index.php