views
commit
Merge branch 'master' of https://github.com/staranjeet/kidsapp

Conflicts:
	kidsapp/kids/views.pyc
	kidsapp/kidsapp/urls.pyc