commit before second local merge with master files
fixed merge conflicts during second merge
edited sign-in and sign-up forms