Added la
Merge branch 'master' of https://github.com/c0g/zshdotfiles

Conflicts:
	.zshrc