added rough skeleton for kid_calendar
working on calendar_kids
form partials working in family_show
playing around with partials - this works, but is strange
DRYed out family show into nested partials
Merge branch 'master' into creating_child_calendar_view

Conflicts:
	app/views/family/show.html.erb
	used Master's version
updated annotations
Merge branch 'creating_child_calendar_view' of github.com:johntrandall/ourday into creating_child_calendar_view

Conflicts:
	app/views/family/show.html.erb
	app/views/kids/calendar.html.erb
	config/routes.rb

merged using my copy