Added CafeMenu, Waitress modified, included alternative version of DinerMenuIterator