Parallel grep
Merge branch 'master' of github.com:fmaker/configs

Conflicts:
	.bashrc