added item selection
merge conflict in coffemachine.cs resolved