final
final
Merge branch 'master' of https://github.com/l-sokolova/ATMTesting

Conflicts:
	.idea/workspace.xml