Added cucumber test to sign in page
added ability to sign up and the test for it
fixed merge conflict
updated model but still failing test