i
Merge branch 'master' of https://github.com/Kyozatch/Metronome.git

Conflicts:
	Metronome/src/Test.java