second
for test repository
Merge https://github.com/jiaying/test

Conflicts:
	README.md
Merge branch 'master' of https://github.com/jiaying/upup