Managed to link with Instagram and receive back a JSON string
Managed to get Instagram Images to display
working with Instagram getting there slowly
draft - required refactoring, one error on last leg of route
Pre-merge
draft
Working on User Auth via tutorial
Created Use passing rspec test with tutorial
Updated some CSS and routing
working on twitter
merge
merge
Merge remote-tracking branch 'ecomba/master' into current_master
merge
some styling issues on thetrips/new page
polylines that work...
fixed the enter bug
Merge remote-tracking branch 'matt/login' into mattscode

Conflicts:
	app/models/trip.rb
commit before switching to different branch
Deleted sneaky layout