Fixed the boo boo...
Merge branch 'master' of https://github.com/evo1167/Apache

Conflicts:
	upload/upload_file.php