Fixed merge gone wrong
Merge branch 'master' of github.com:AlSzacrel/CoinSelectionSimulator

Conflicts:
	scala/Wallet.scala