pdf
Merge branch 'master' of https://github.com/larrychen1990/git.git
Merge branch 'master' of https://github.com/larrychen1990/git.git

Conflicts:
	note.md