Adding API to controllers
Merge branch 'api' of github.com:christoffer-Van/ETA into api-steroids

Conflicts:
	config/routes.rb
	log/development.log
	tmp/pids/server.pid