资讯
Merge branch 'master' of https://github.com/vicky1221/CarsInfo

Conflicts:
	CarsIntro/CarsIntro/UI/ViewController/TypeViewController.m
	CarsIntro/CarsIntro/UI/XIB/CarsCell.xib
merge