little changes
WORKING VERSIONgit status
merging changes
cleaning up and renaming the files