alias
Merge branch 'master' of https://github.com/alexey-fut/configs

Conflicts:
	.bash_aliases