JS / DOC edit
Merge branch 'master' of https://github.com/harrychuang/timelineScroller

Conflicts:
	doc.txt