fixed merge conflict
added dollar sign to prices
Merge pull request #436 from shutter111/development

fixed merge conflict