pull
Merge branch 'master' of https://github.com/PAEYCiOSTeam/KindergardenHereICome

Conflicts:
	KindergardenHereICome/Storyboard.storyboard