major redesign
Merge branch 'master' of https://github.com/gabs1234/Metronome

Conflicts:
	metronome.js
major redesign