fixed conflits with dropbox and removed master branch