Fixed bug with file upload: bad logic in code threw an uncaught exception.
Merge branch 'master' of github.com:AppStateESS/phpwebsite