Added column in Ingredient partial for ingredient cost / unit.
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git
into HEAD

Conflicts:
	barista-matic/src/main/webapp/assets/css/style.css
	barista-matic/src/main/webapp/ng-app/controllers.js