Routific configuration
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop

Conflicts:
	eta_rails/app/assets/javascripts/application.js
	eta_rails/app/controllers/deliveries_controller.rb
	eta_rails/app/views/deliveries/index.html.erb
removed whitespacing
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop
Twilio API added
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop

Conflicts:
	eta_rails/app/assets/javascripts/application.js.erb
Fixed merge...
Modification to js organization