Charging algorithm working
Merge branch 'origin/master'

Conflicts:
	app/controllers/utility_controller.rb
	app/views/car_app/index.html.haml
	config/routes.rb
Charging algorithm
Merge fixes