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 Juan's changes with master
Implement sign in using devise
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.
what do we have to do to stop getting these Gemfile.lock conflicts