facebook auth edits
adding twitter auth
fixing conflicts with closing bracket
Merge branch 'dev' of https://github.com/GoOutside/master into facebook
adding basic auth, login still not working, all logins accepted
Merge pull request #6 from GoOutside/facebook

Facebook