added rough skeleton for kid_calendar
added rough skeleton for kid_calendar
working on calendar_kids
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
Merge branch 'master' into creating_child_calendar_view
simplified ERB tags in family partials
tweaked callback to create family after create rather than before.
made dynamic calendar link button for kids in _person partial
Merge commit 'a5470f7604f923c9b09fe6c73d63e1c8b4edc2f2'
added 'debug' command to view files for cleaner views'