log without facebook working
resolved conflicts
Merge pull request #57 from nairys/login_without_facebook

Login without facebook