Update Hausaufgabe Automat
Update Hausaufgabe Automat
Merge branch 'feature/HomeworkChris' of https://github.com/Simmesimme/CoffeeTest into feature/HomeworkChris

Conflicts:
	Broth.coffee
	Coffee.coffee
	Tea.coffee
	automat.coffee
	test.html
Update