added aliases
Merge branch 'master' of github.com:stv0g/dotfiles

Conflicts:
	.bash_aliases