stuff
Merge branch 'master' of https://github.com/jssjr/dotfiles

Conflicts:
	zshrc