fixbug1
master3
fixbug2
Merge branch 'fixbug' of https://github.com/richardgong1987/gitTest into fixbug

Conflicts:
	fixbug.html
	gitTest1.html
	gitTest2.html
	gitTest3.html
fixbug3
fixbug 4
fixbug 5
Merge branch 'fixbug'

Conflicts:
	fixbug.html
	gitTest1.html
	gitTest2.html
	gitTest3.html
master 5
Merge branch 'master' into Develop