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
sincroning with remote
Merge remote-tracking branch 'upstream/master'
local authentication features
Merge pull request #13 from mtc2013/master

bug fix with specs/cucumber
Merge Juan's changes with master
Implement sign in using devise
Calls to gmapsAPI was stubbed
Mark unimplemented features as pending and add modify spec_helper to work with devise as per https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29
Remove temp file:  features/step_definitions/mm
Comment out pending features so travis CI does not report a failure.
Merge pull request #15 from sol1dus/gmapsstubbing

Calls to gmapsAPI were stubbed
added cucumber scenarios for sign in feature
Resolved merge into master with upstream
Some refactorings to stubbing gmaps calls was added
Merge pull request #18 from sol1dus/master

Refactoring in "gmaps stubbing" chore
what do we have to do to stop getting these Gemfile.lock conflicts
Gemfile.lock needed for heroku again, not sure why it got removed - guess I deleted and re-added to merge that last stuff from Marian