EPC 31 01
Merge branch 'master' of https://github.com/rorydog1/phpUpload

Conflicts:
	php_stage1_indesign_parse.php
	php_stage2_make_auth_sql.php