coooommmmmiiiiiittttt
Merge branch 'master' of https://github.com/mathildegui/metronome

Conflicts:
	bin/command/CmdMarkMeasure.class
	bin/model/MetronomeEngineImpl.class
	src/model/MetronomeEngineImpl.java