Added Amys wonderful drink list and images.  Untested ability to order approved drink
Fixed conflicts
Merge branch 'develop' of github.com:filitchp/spiritedrobotics into develop