i
Merge branch 'master' of github.com:hyrtyp/ChildeduProject

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
	Account/Account.iml
	Base/Base.iml
	Childedu/Childedu.iml
	settings.gradle