Fixed merge conflicts + added upload functionality
Fixed merge conflicts + added upload functionality

pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral