init home commit
init home commit 2
Merge remote-tracking branch 'orogin/master'

Conflicts:
	.gitignore
	build.gradle
	src/main/AndroidManifest.xml
	src/main/ic_launcher-web.png
	src/main/res/drawable-hdpi/ic_launcher.png
	src/main/res/drawable-mdpi/ic_launcher.png
	src/main/res/drawable-xhdpi/ic_launcher.png
	src/main/res/drawable-xxhdpi/ic_launcher.png
	src/main/res/layout/fragment_main.xml
	src/main/res/values/strings.xml
Merge remote-tracking branch 'orogin/master'
mod AndManifest