added styling to login page
conflicts fixed
Merge pull request #25 from wvmitchell/login_styling

Login styling