lnglat figured out
Lat and lng plotted and map included
unimportant changes
changing directories
DS Store
Integrated routific into routes so that /routes will return the routified waypoints
maps ploting
Merge branch 'feature/maps' into develop
Merged
google map with wp
Routific configuration
another commit
what what
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
bug commit
removed whitespacing
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop
calculates distance
Twilio API added
Merge branch 'develop' of github.com:christoffer-Van/ETA into develop

Conflicts:
	eta_rails/app/assets/javascripts/application.js.erb