temp changes
Merge branch 'master' into Dee
updated all arraylists to be saved in .ser files and uploaded on startup