Nuevo!!! casi bueno! :3
Merge branch 'master' of https://github.com/SpaceAppsGda/GalacticGuardians

Conflicts:
	RegisterUpload.php
Merge branch 'master' of https://github.com/SpaceAppsGda/GalacticGuardians