Added shorthand for my normal ls
Merge branch 'master' of github.com:Rovanion/.files

Conflicts:
	.bashrc