Started work on multi-color play paths
Merge remote-tracking branch 'origin/master'