changes to welcome css
want to pull
errors on login and signup handling
fixed conflicts
fixed conflicts