removed hello world
I wanna play ffx
Merge branch 'master' into testing

Conflicts:
	index.html