merging
Merge https://github.com/shamirwa/Chord

Conflicts:
	Chord.cpp