Stupid
Merge branch 'master' of github.com:brousalis/dotfiles

Conflicts:
	custom/alias.sh