Added four dotfiles
Added a readme
resolved merge conflict in README.md