gitignore
Merge branch 'master' of https://github.com/francescozaia/metronome

Conflicts:
	.gitignore