edit and marktodo fixed
Merge branch 'master' of github.com:mLewisLogic/foursquare

Conflicts:
	foursquare/__init__.py