removed extraneous Gemfile.lock.orig file.
Merge branch 'master' of https://github.com/devdame/DBC-final-project
removed the extraneous 'require zlib' from geofeedia_test_data
added new uofm and uofi seed files.
Merge branch 'master' of https://github.com/devdame/DBC-final-project
bringin in the changes
can get information from the files we got from geofeedia into our database via a seed file
Merge pull request #22 from devdame/seed-setup

Seed setup