Add more aliases
Merge branch 'master' of https://github.com/KDercksen/dotfiles

Conflicts:
	.bashrc