bash_aliases
Merge branch 'master' of github.com:teplyakoff/dotfiles

Conflicts:
	.bash_aliases