merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Magic.Pairings/bin/Debug/magicPairings.txt
	Magic.Pairings/bin/Debug/magicPlayerList.txt