Shopping cart now appears with beers of the week when a customer logs in
resolved merge issue
Merge branch 'gh-pages' of https://github.com/BadAssGUIGroup/FlyingDutchman into gh-pages