Merge commit for real this time
updates to menus and cart handling code
Merge pull request #21 from FearsomeFoursome/AR-Branch

merge