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

Conflicts:
	Childedu/build.gradle