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
made the user test pass. Also removed username and password from database.yml
added better_errors gem, updated README