upload data scv files gilda
Merge branch 'master' of github.com:okinoz/sample_app

Conflicts:
	db/seeds.rb