modified
Merge branch 'master' of github.com:piiiiiiin/dotfiles

Conflicts:
	.bashrc