protect upload
Merge branch 'master' of https://github.com/Team-Bogota-PHP/TeamProject

Conflicts:
	upload.php