fixed dropbox folder
Configured git name/email
Merge branch 'master' of github.com:erfanimani/dotfiles

* 'master' of github.com:erfanimani/dotfiles:
  forgot to commit removed items