take new commits of implicit-git-rm
use implicit-git-rm
Merge branch 'master' of github.private:kakkun61/dot_files

Conflicts:
	.bashrc
diff-highlighted