fixed users#show route and updated user show method
Fixed merge conflict
Logo leads to homepage
Updated signin and signup view with bootstrap
devise view edit