updated readme and removed Dropbox conflict files