added company id to locations
added routes for locations
pulled from master
fixed routes
fixed conflicts
Merge pull request #19 from amandamcwhorter/am/add_locations_to_company

Am/add locations to company