Update index.php
Update index.php
dfdf
commit
Merge branch 'master' of https://github.com/xiayn/tatata.git

Conflicts:
	index.php
	nbproject/project.properties
	nbproject/project.xml
commmi
Merge branch 'master' of https://github.com/xiayn/tatata