add a new line on 1.
Merge branch 'master' of github.com:pjxiao/git-practice

Conflicts:
	README.md