Getting ready to deploy
Added in my paloma code to the restructured directories
Removed paloma because it was interfering with twilio
heroku deployment
Configuring old code for new version
log merge
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
asdassd
asdasdasd
adasd