deleting DS_Store
merging
formatting of code