Adding a comment
Merge branch 'master' into Enabling_Sound

Conflicts:
	BalloonPop/bin/classes/com/example/balloonpop/GameView.class
merging tentative 1