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

Conflicts:
	bwt/.classpath
	bwt/src/bwt/T.java
Merge branch 'master' of https://github.com/bwtrepo/bwt.git

Conflicts:
	bwt/src/bwt/T.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	bwt/src/bwt/T.java