finishing getting money
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/logic/ATM.cpp