completed user_sign_up test, model, views, routes
updated home route for heroku deploy
fixed merge conflicts