Updated _form, edit, new, and show
Merge branch 'master' of https://github.com/TaxiRating/Server
Updated  _form, edit, new, show for web app
Sprint 3
Adding Will's changes.
Merge branch 'css' of https://github.com/TaxiRating/Server
Merge branch 'master' of https://github.com/TaxiRating/Server into users
Minor adjustments
Merge branch 'master' of https://github.com/TaxiRating/Server

Conflicts:
	app/views/drivers/edit.html.erb
	app/views/drivers/new.html.erb
Reorganized driver index page
Merge with master