re cuek
Merge branch 'master' of https://github.com/alfa30/BankTest

Conflicts:
	build/classes/main.class
	src/main.java