Added dotfiles
merge