started audio code
Merge branch 'master' of
https://github.com/Prince781/HAMR-Project-2013.git

Conflicts:
	src/CreateGenreFeatureDB.java
adding jAudio from jmir
Merge branch 'master' of https://github.com/Prince781/HAMR-Project-2013.git
audio stream now plays correctly
why doesnt this work
Merge branch 'master' of
https://github.com/Prince781/HAMR-Project-2013.git

Conflicts:
	.classpath
	.gitignore