redundant private keyword
Merge branch 'master' of github.com:alexwilkinson/families
Merge branch 'master' of github.com:alexwilkinson/families
made basic family form, writing helper methods, writing spec
still working on it!
Merge branch 'family-form' of github.com:alexwilkinson/families into family-form
small change
please work
Merge branch 'master' into family-form
passed first spec
Merge branch 'master' of github.com:alexwilkinson/families
Merge branch 'master' into family-form
confirmation works
passing some more specs
email confirmation working\!
Merge branch 'family-form' of github.com:alexwilkinson/families into family-form
passing a lot more specs, still need to pass more
stubbed out more tests
updates to the show form
Merge branch 'family-form' of github.com:alexwilkinson/families into family-form