strange. tests should pass
change numVoices to size in Music. Clean up warmings in tests.
change sizeInMeasures to size in class Measure.
add more test to ABCmusic
41
aderge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp13/projects/abcplayer/lianchen-linqian-pashamur

Conflicts:
	src/player/HeaderTest.java
41 2
41 3
minor changes to Music
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp13/projects/abcplayer/lianchen-linqian-pashamur
minor change to HeaderTest
delete unused header in HeaderTest
nothing new
touches Pair, Header and TestHelpers
delete HeaderTest in player
minor cleanup in Token/TokenTest