init commit
Merge branch 'master' of github.com:email2liyang/AndroidApplication

Conflicts:
	.gitignore