updated "pss"
Merge branch 'master' into dedi

Conflicts:
	.zshrc