2nd commit
Merge branch 'master' of https://github.com/lijusod/hello-git

Conflicts:
	index.php