Still testing conflicts
Merge branch 'master' of https://github.com/avr6130/ATM-BANK

Conflicts:
	README.md