removed .tmp from untracked files
styles applied to login and signup pages
fixed merge conflicts
updated styles