Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
pulled from master
working on logins
foursquare and standard login/logout working properly
merging
Merge branch 'dheckman-master'
Merge pull request #19 from Noahhh/master

Merged from Dani