Deletion of unecessary files
Can now shoot the rock
merging