Implemented drink queue
Merge branch 'develop' of https://github.com/Jherrmann5/ABA into develop

Conflicts:
	app/views/home.html