modify decorator pattern + add BasicCoffee

modify decorator pattern + add BasicCoffee
implemented / refactored decorators / items

implemented / refactored decorators / items
Merge branch 'master' of https://github.com/Deneas/VA-M223.git
test branching