updates
Merge branch 'master' of github.com:mtholder/supertree-study

Conflicts:
	myscript.sh