added dotfiles
merged