Merge pull request #8 from zapiski/master

asdfasd
google and twitter login
Merge pull request #44 from rokkolesa/master

google and twitter login