csved
Merge branch 'master' of github.com:bikeindex/resources

Conflicts:
	manufacturers.csv