cracked geofeedia and alchemy apis
solved lock file merge conflict
included original gemfile lock
Merge pull request #14 from devdame/db_setup

Db setup