Attempting to use Paloma gem but unable to load successfully in js
Merge branch 'feature/paloma' into develop
fixing the date...
Merge branch 'develop'

Conflicts:
	eta_rails/app/controllers/twilio_controller.rb
	eta_rails/tmp/cache/assets/development/sprockets/f441a881c8be4665a860b1651d476ebc
drop shadow
Added gitignore file
click gmap event:
pulling from origin api
merging conflicts in tmp/cache
Cleaned up index html code
In middle of adding date sorting to web app
Added calendar
Trying to clean up datepicker and allow it to route properly. Might have to rewrite backend in AJAX
Added comments to deliveries table
Merge branch 'develop'
DS Store
Added datepicker to create page and fixed formatting
Merge branch 'feature/datepicker' into develop

Conflicts:
	db/schema.rb
	log/development.log
discarding this feature
Merge branch 'feature/ajax' into develop