changed
Merge origin/master

Conflicts:
	build/classes/banktwotranslator/BankTwoTranslator.class
	nbproject/private/private.xml
	src/banktwotranslator/BankTwoTranslator.java