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

Conflicts:
	project3/src/edu/uwec/cs/cs355/group14/rulegeneration/APriori.java

	project3/src/edu/uwec/cs/cs355/group14/rulegeneration/AssociationRule.java

	project3/src/edu/uwec/cs/cs355/group14/rulegeneration/AssociationRuleSet.java
	project3/src/edu/uwec/cs/cs355/group14/rulegeneration/Timer.java
	project3/src/edu/uwec/cs/cs355/group14/rulegeneration/Transaction.java

	project3/src/edu/uwec/cs/cs355/group14/rulegeneration/TransactionSet.java
	project3/src/edu/uwec/cs355/group14/tests/TransactionSetTest.java