fixed user login
fix merge conflict
Merge pull request #15 from gopher-snakes-2013/password_validation

Password validation