add a file
Merge branch 'master' of https://github.com/sdnuliu/Android

Conflicts:
	readme.txt