add price_max to filter string
Merge branch 'master' of https://github.com/StevenHarlow/shakeventure
remove commited merge conflict
fix commit mistakes
merge master
hide filters after shake
Merge pull request #17 from StevenHarlow/location

Location