fixed bug where password hash with bcrypt wasn't working
trying to start allowing user to login...
changed some spacing around
Merge remote-tracking branch 'origin' into user_authentication
changed spacing for nina
Merge pull request #37 from mule-deer-2014/user_authentication

User authentication - ok