Americano

3 cl Campari
3 cl red vermouth
A splash of soda water
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/CountingMultipleEvents/Context.java