WTF Github.
Merge branch 'master' of https://github.com/danvas/cs304-part3

Conflicts:
	src/PurchaseOperations.java