modify trundle lib
Merge remote-tracking branch 'origin/master'

Conflicts:
	trundle/trundle.html