task 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/t2/CurrencyTable.java