添加初始化界面
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.name
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	OLME-graduate.iml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/olme/activity/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/styles.xml
	settings.gradle