bugfix; playing and coloring joined
Merge branch 'master' of https://github.com/mateuszbuda/ParallelMusicians into mateuszbuda-master

Conflicts:
	main.c
Merge branch 'mateuszbuda-master'