My part done

Yeah
Done without problems

Yeah
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ATM.pro
	bin/ATM.pro.user