adding twitter auth
fixed merge conflicts
Merge branch 'development' of github.com:ctorok/AngelHack_GA_2013 into development