Merge branch 'master' of https://github.com/dbspringer/AuttoPromo

Conflicts:
	auttopromo.php
fixed