renamed
Merge branch 'master' of https://github.com/liddictm/cs355team14

Conflicts:
	project3/src/edu/uwec/cs355/group14/tests/TransactionSetTest.java