Class notes
Merge branch 'master' of https://github.com/dcostinett/CP130_05

Conflicts:
	src/edu/uw/danco/broker/OrderQueueImpl.java