New restar
Merge branch 'master' of https://github.com/caseycole589/foursquare

Redoing everything