combo control and the scene
Merge branch 'master' of https://github.com/luisbaugusto/rhythm-bullet-hell-game

Conflicts:
	.gitignore
	BulletBeats/Library/assetDatabase3
git ignore
Merge branch 'master' of https://github.com/luisbaugusto/rhythm-bullet-hell-game