api update
starting work on restful api
Merge branch 'api' of github.com:christoffer-Van/ETA into api

Conflicts:
	config/routes.rb
	log/development.log
	tmp/pids/server.pid
API routes added
Adding API to controllers
Merge branch 'api'
added access control allow origin config
Merge branch 'api'
Removed unnecessary columns from deliveries table
Added Google Distance Matrix js service to calculate travel time and pass on the data to twilio controller
Merge branch 'api'