Add Man
Merge remote-tracking branch 'origin/master'

Conflicts:
	books.txt
Merge branch 'master' of https://github.com/lion741205/test_git

Conflicts:
	books.txt
Merge branch 'master' of https://github.com/lion741205/test_git