Test
Merge branch 'master' of https://github.com/twlkyao/AndroidCloud

Conflicts:
	README.md