First combine
Merge branch 'master' of Gyczero.github.com:Gyczero/SportCombineWell

Conflicts:
	README.md
Merge branch 'master' of Gyczero.github.com:Gyczero/SportCombineWell

Conflicts:
	README.md

ddd