seksiness
Merge branch 'master' of github.com:iwfmp/zsh

Conflicts:
	.zshrc