training data
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	genTrainingData.m
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
4 notes per chord simplification