Added car to show page
Merge branch 'origin/master'

Conflicts:
	app/views/cars/show.html.haml
Car page
Merge branch 'origin/master'