lala
Merge branch 'master' of https://github.com/EdisonSM/gidHubTest

Conflicts:
	gitSiteTest/index.html
chenged to yours