deleted Wil's webstorm IDE settings
merge conflicts WIP server and cloudinary