Fixed price fucker on newFloor
Fixed merge conflict
Merge branch 'master' of https://github.com/Fuzzlr/Agropolis