css added to the sign in page
merge conflicts