Fixed upload.php for Zone
Fixed an import error and updated UserID and Secret fields
Merge branch 'master' of github.com:JuanAstor/DECO3801-Repo
Deleted Mockup, started 'Assign critiques'

title
Revert "Deleted Mockup, started 'Assign critiques'"

This reverts commit b39674c553e44bf5269f5d9e0d78eb0d00fce7cf.
Revert "Fixed an import error and updated UserID and Secret fields"

This reverts commit cdb99b1d676f3958fd3ac725e45f920cad153cd0.
FIXED errors. Reverted to an older version

Was getting access denial when trying to connect to the database.
Something was changed between Lachlan's and Mine, not sure what.
Merge remote-tracking branch 'origin/master' into Authentication