modified:   t.sh
Merge branch 'master' of github.com:zanjibar/toolslib

Conflicts:
	t.sh

	modified:   t.R
	deleted:    t.sh