shinokee commit desktop
Merge branch 'master' of
https://github.com/shinokee/euterpe.pitchExtract.git

Conflicts:
	pitchExtract/res/values/strings.xml