login styling
merged conflicts fixed
adding files
updated file
Merge branch 'master' into alex
merged master