Added gems therubyracer and execjs to correct this error:
Could not find a JavaScript runtime. See https://github.com/sstephenson/execjs for a list of available runtimes.
pp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
BDD/TDD pair programming start to implementing story 45392735, donate to local charity info
more progress on donation info show within charity
bdd/tdd to get failing cucumber feature to pass
Cleaned up some spec/steps
Merge branch 'master', remote-tracking branch 'origin/master'
BDD/TDD to deal with sad path of no donation_info url
Merge branch 'donationinfo'
Update README.md
sincroning with remote
Merge remote-tracking branch 'upstream/master'
local authentication features
Merge pull request #8 from mtc2013/master

some changes from donationinfo branch
wrapped test and scenario around search results not displaying in map, and fixed problem which was not assigning gmap4rails json in search method on organizations contoller
Bug fix and accompanying scenariio for edit charity address and geocoding
Added rspec for bug fix
.travis.yml was added

forgot to add db:migrate

Remove debug breakpoint

Original Gemfile.lock

Calls to mapsAPI specs was stubbed
Calls to gmaps API was stubbed in specs