More stuff and things
Deleted gedit backup file
Merged