commit 2
manual merge + merge tool for commit 11

Merge branch 'master' of https://github.com/tonydqwang/hobby.git

Conflicts:
	HttpClient/src/main/RailsWebApp.java