deleted redundant files
merged develop