sass setting
before scaffold
scaffold companies
carrierwaveを積んだ
youtubeの動画を引っ張ってくるようにした
Merge branch 'master' of github.com:gamerinshaft/Cyllabus_companies

Conflicts:
	app/controllers/companies_controller.rb
	app/models/company.rb
	db/schema.rb
	test/fixtures/companies.yml
	test/functional/companies_controller_test.rb