Added a trial object that saves itself to shared preferences
Added a gitignore
Made it so that the Trial is saved when updated and the screen changes
Removed more files that will only cause merge conflicts
Fixed merge conflicts so no errors occur now