Merged master fixed conflict.
Merge Conflict
Merging
Merge branch 'master' of https://github.com/tazjel/zdotfiles

Conflicts:
	1/.zsh/al.zsh