增加android模块
增加android模块
增加ANDROID模块
Merge branch 'master' of https://github.com/CoryAlice93/SofeWareDesignMatch

Conflicts:
	.gitignore