added (actually) working price
Merge branch 'master' of github.com:strohy1210/RailsOnRails

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/search/search.html.erb