Commit

Fuck yeah
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ATM.pro.user