Add user login
not sure
fixed merge conflict in controller
added authentication
complete user authentication. Basic version, no password hash from gem Bcrypt
Merge pull request #4 from arcin/user_login

User login
fixes merge conflict in user model