Convert tempo to bpm
Convert beats into bpm (i.e. tempo).
Merge branch 'master' of github.com:willcrichton/mystro

Conflicts:
	www/js/data.js