Added generic beverages
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Fred/Uebung.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Test