kid  now associated with caregivers through family.
Merge branch 'JR_master' into JR_sandbox_creating_child_calendar_view

Conflicts:
	app/models/kid.rb ... resolved by taking the master copy
Merge branch 'JR_main' into JR_sandbox_creating_child_calendar_view
fixed associations for calendar entries
fixed associations for calendar entries
Merge branch 'JR_sandbox_creating_child_calendar_view' of github.com:johntrandall/ourday into JR_sandbox_creating_child_calendar_view

Conflicts:
	admin/working_folder_John/Architecture Documents.graffle
installed backbone, underscore. Starting on child_calendar.js
removed unneeded files, fixed typo
added 'better errors' and meta-request/rails-panel debug tools
Backboned appointments and childcares!
added templates in kid_calendar view
fixed css bugs in kid_calendar view
DRYed out calendar entries controllers
DRYed out calendar entries controllers
Merge branch 'JR_sandbox_creating_child_calendar_view' of github.com:johntrandall/ourday into JR_sandbox_creating_child_calendar_view

Conflicts:
	app/controllers/appointments_controller.rb
added kid-clock to backbone
cleanup for code, various
reworked JS file inclusion
working on positioning
installed Jasmine rails. Fairly simple