aaaaa
bbbbb
mmmmmmmmmmmmmmm
n2222222
Merge branch '1.0-branch'

Conflicts:
	test1/src/Abc.java
First checkin: Http post/get request to access a website
Can send request but has encoding issue.