Modified stuff.
Merge branch 'master' of ssh://github.com/trozamon/dotfiles

Conflicts:
	zshrc