Using ng-readonly with adding a coupon code.
Using ng-checked to add "send me the newsletter".
Using ng-href to create dynamic links to google search. Also fixing the width of the fieldsets.
Using ng-src to dynamically choose a cute kitten to display.
Using ng-include to include the promotional markup.
Don't know how to use variables in ng-include value.
Using ng-include to include the promotional markup.
Using ng-switch to show inventory status in UI.
Fixing use of ng-include, it creates a child scope, and we want hasCoupon to be on the parent scope, in order for the right cat picture to show.
Using ng-if to only show cancel button once buy button is enabled.
Using ng-init to declare and initialize hasCoupon in the template rather than in JavaScript.
Removing workspace.xml from git so it doesn't show up in the repo any more.
Implementing a directive that makes use of most of what's in the "Introduction to Directives" chapter in the AngularJS book.
Making the build work. Using PhantomJS to run tests for faster-running tests. You should run 'npm install' after pulling this revision, as this will install the PhantomJS runner.
Intermediate commit for the next meeting. I'm committing this just to transfer the work I've done from home to work. Though this is an intermediate commit, tests should pass.
ui-router demo (added Admin page to set prices; fiddled with number formatting).
Had to comment out directive tests due to unknown issue with ui-router.
Merge branch 'master' of github.com:davidleston/CoffeeVendingMachine

Conflicts:
	.idea/workspace.xml
	app/index.html
	app/partials/prices.html
	app/partials/purchase.html
	app/scripts/main.js
	app/scripts/name-selector-directive.js
	bower.json
	karma.conf.js
	package.json
	test/spec/name-selector-directive-spec.js