feat(提交):master 分支 github 提交测试
Merge branch 'master' of github.com:Morphin3/JourneyToAndroid

Conflicts:
	README.md