first commit
Merge branch 'master' of github.com:jiechic/AndroidText

Conflicts:
	.gitignore