added max price to side bar with changes in shop controller, also fixed dropdown shop box
Merge branch 'master' of github.com:nina-lauc/raggedy

Conflicts:
	raggedy_app/app/controllers/shop_controller.rb