erwt5
Merge branch 'master' of https://github.com/6366295/ncc_week1

Conflicts:
	.idea/gradle.xml
	app/app.iml
	lib/lib.iml
	ncc_week1.iml
Merge branch 'master' of https://github.com/6366295/ncc_week1

Conflicts:
	.idea/gradle.xml
	app/app.iml
	lib/lib.iml
	ncc_week1.iml