merge
Merge branch 'master' of https://github.com/Nepetalactone/ScaleFinder

Conflicts:
	ScaleFinderConsole/ScaleFinderConsole/Chord.cs
	ScaleFinderConsole/ScaleFinderConsole/Program.cs
	ScaleFinderConsole/ScaleFinderConsole/Scale.cs
	ScaleFinderConsole/ScaleFinderConsole/ScaleFinderConsole.csproj