Added bpm meter
Added bpm meter
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/soupcan/aquapulse/controller/InputController.java
	src/com/soupcan/aquapulse/state/GameplayState.java
Merge remote-tracking branch 'origin/master'
Fixed music