コンフリクト
Merge branch 'master' of https://github.com/techlogics/Android_Document

Conflicts:
	README.md