Sound test stuff
Merge branch 'master' of https://github.com/burkaman/hophacks2013

Conflicts:
	hophacks2013/nbproject/project.properties
	hophacks2013/src/SoundTest.java