add activity stuff
bla
Merge branch 'master' of https://github.com/TalAcademic/FinalProject

Conflicts:
	Kindergarten/KindergartenApp/Kindergarden/AddActivity.aspx