started work on sign-up form
Merge branch 'master' into signup-form
made signup form, not redirecting to family form yet
resolved merge