UI that displays the cost of the drink.
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git
into HEAD

Conflicts:
	barista-matic/src/main/webapp/ng-app/controllers.js
	barista-matic/src/main/webapp/ng-app/partials/drink.html