Another test of file collisions and merging.
no message
Merge branch 'master' of https://github.com/avr6130/ATM-BANK

Conflicts:
	README.md