backup befor merge
Merge branch 'master' of github.com:lalor/note

Conflicts:
	git.md
修改了git.md，增加了remote部分