Merge branch 'develop' of https://github.com/despondentdonkey/bpm into parseTest
Added Interval to GUI which can act like a timer. It will be used in the
future for animations.
Merge branch 'develop' of https://github.com/despondentdonkey/bpm into donkey

Conflicts:
	gui.js
Removed merge conflict tags
Added better bubble tinting.
Added a level.
Changed some of the bubble tint so it stands out.
Removed upgrades from normal mode.
Merge branch 'develop' into donkey

Conflicts:
	assets.js
	bpm_states.js