change welcome page with new logo and sign in function, added modal for sign up
merge conflicts