added _form for new child
minor refactoring of indentation
rendered partial on family view
add over code from master
about to merge from master locally
resolved my first merge conflict
params passing from new child form
Merge branch 'authentication_via_devise_STI' of github.com:johntrandall/Project2 into new_child_form
workin on family edit partials
lots of form bits working - lots left to do
front end form done, making new branch for all partials
started working on caregiver form
merge conflicts processed
more progess on caregiver form
fixed second merge conflict on partials
createchild and kidview with pj in admin folder
devise test models and stuff
merged conflicts
pushing for john to pull
Merge branch 'partial_forms' of github.com:johntrandall/Project2 into partial_forms