made a signup form
fixed merge