fixed logging and refactored archived transactions to return an int
Merge branch 'master' of github.com:nyson/db-assignment1

Conflicts:
	weraFinal/Metoder.java