conflict checking
pricing filter works now
conflict spots don't show now or shouldnt
Merge branch 'master' of https://github.com/VWJF/417ParkingSpot