fix bug
Merge branch 'master' of github.com:nicomontes/carmanage

Conflicts:
	views/car/list.erb
fix bugs