test by st125475466 5.10 10:46
Merge branch 'master' of https://github.com/bcl104/ns3.git
by will
Delete phy-test.cc
Delete single-phy-test.cc
Merge branch 'master' of https://github.com/bcl104/ns3.git

Conflicts:
	scratch/phy-test.cc
Merge branch 'master' of https://github.com/bcl104/ns3.git