Delete custom-cookies.sublime-workspace
Merge branch 'dev'