reading
Merge branch 'master' of github.com:Harry-Wang/MyDocuments

Conflicts:
	10-book-case/rails3.0/Agile Web Development with Rails (4th edition) .pdf