found my gem i like
Merge branch 'master' into Foursquare

Conflicts:
	Gemfile
	Gemfile.lock
putting in client model
fixing gemfile lock
bundle to bring in other gems
working api
made some models and controllers in order to get my views working
going back to master
Merge branch 'master' into Foursquare

Conflicts:
	Gemfile.lock
making some git merge happen
now have my foursquare hash work in views
going home for the night
Merge branch 'master' of github.com:daniel1bell/over-there