Began implementing decorator pattern
added further logic to coffeemachine
Merge branch 'master' of https://github.com/Deneas/VA-M223.git
merge conflict in coffemachine.cs resolved