Minor changes to recording test
Merge branch 'master' of https://github.com/amadeus428/trunk

Conflicts:
	Amadeus_Test/src/com/cs429/amadeus/test/RecordingTest.java