Threaded Player
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lab2/src/test/resources/test.xml