modif gemfile
Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	Gemfile
test
Some corrections
Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	app/assets/javascripts/application.js