rewrote alldata for flexible companion length
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js
Merge pull request #144 from jpecht/master

alldata - flexible companion length