x
Merge branch 'PaintKids' of https://github.com/mifmax/EducationKids.git
into PaintKids
renew
renew
split
split2
refuck
+1
1
erase
prop
next
rebred
q
finish him
refact
vdogonky
res
Merge branch 'PaintKids' of https://github.com/mifmax/EducationKids.git
into PaintKids

Conflicts:
	bin/PaintKids.apk
	bin/classes.dex
	bin/classes/home/maximv/paintkids/EraseLayout.class
	bin/classes/home/maximv/paintkids/MagicLetter$1$1.class
	bin/classes/home/maximv/paintkids/MagicLetter.class
	bin/classes/home/maximv/utils/ColorPickerDialog$ColorPickerView.class
	bin/classes/home/maximv/utils/Places.class
	bin/resources.ap_
finish him