prep for setting up dotfiles at home
add local files
merge conflicts caused when changing origin url