First change on second installed computer.
Merge branch 'master' of https://github.com/Ruin0x11/dotfiles

Conflicts:
	aliases
	zshrc