modified
Merge branch 'master' of https://github.com/heyuncoder/studygit

Conflicts:
	heyun.go