Modifications
More Modifications
Merge branch 'transaction_overview' of https://github.com/utwente-di/di15 into transaction_overview

Conflicts:
	src/main/java/nl/utwente/di15/database/DatabaseQueries.java