deleted .idea/
new updates for cp osiris
merging finished