changed seed
fixed imaginary merge conflicts
can now use seed file to turn geofeedia files into new rows on our database csv for re-seeding without making api calls
x
Merge branch 'master' into import_data
Merge pull request #31 from devdame/import_data

Import data
Merge branch 'master' into controller_logic
changed uniqueness validation to proper model