11
Merge branch 'master' of https://github.com/bwtrepo/bwt.git

Conflicts:
	bwt/src/bwt/T.java