starting display of timeline
Merge branch 'master' of https://github.com/tulrich/drums

Conflicts:
	drums/drums.html
	drums/song.js