a start
renamed link to setup, now installs oh-my-zsh
Merge branch 'master' of github.com:tstone/.dotfiles

Conflicts:
	README.md
imported atom config from macbook