RealShopping.java merge

This file was accidentally left out of the last merge. Information on the conflicts is in the comments of 8ef7fe0