comitted changes for merge
Merge branch 'master' of git@github.com:pmanko2/512_project

Conflicts:
	src/TransactionManager/Transaction.java