Updated with servo control for automated coffee dispensing
Merge branch 'master' of https://github.com/Barista-Bot/coffee-machine-control

Conflicts:
	scripts/coffee_machine_server.py