Create README.md
.vimrc
zsh and bin
Merge branch 'master' of github.com:pedrogimenez/dotfiles
update my theme
fix the path to the dotfiles
alias to access the dotfiles folder
:shipit:
:lipstick:
More alias
More vim customization
Merge branch 'master' of ssh://github.com/snieto/my-dotfiles

Conflicts:
	zsh/aliases.zsh