Fixes to beat detection
Merge branch 'master' of https://github.com/chief-tyrol/301game

Conflicts:
	301game/src/edu/rice/horace/model/sound/SoundAnalyzer.java