fixed Login error.
fiddling around
Merge branch 'master' into kyle
style edits