location model
Merge pull request #3 from LGlavin/market

location model