finishes top four badges
Merge branch 'master' of https://github.com/Egogre/drinking_dash

Conflicts:
	app/controllers/order_items_controller.rb
Merge branch 'master' of https://github.com/Egogre/drinking_dash