login working with foursquare,twitter and self
merge conflicts
meeerge
Merge pull request #31 from Noahhh/master

Merged from dani, '	login working with foursquare,twitter and self '