edit index.php
Merge branch 'master' of github.com:qixingyue/app68

Conflicts:
	index.php
hello