Working player

Most bugs are now fixed
Main for test of player
Merge remote-tracking branch 'origin/PhysicalLayer' into PhysicalLayer

Conflicts:
	main.cpp