test commit 2
merge with commit 5

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

Conflicts:
	HttpClient/src/main/RailsWebApp.java - keeping commit 2's code