please work
Merge branch 'master' into family-form
confirmation works
email confirmation working\!
Merge branch 'family-form' of github.com:alexwilkinson/families into family-form
updates to the show form
Merge branch 'family-form' of github.com:alexwilkinson/families into family-form