# merge
merge
# apply gitignore
Merge branch 'develop' of https://github.com/tagia0212/EverBeats into develop

Conflicts:
	Library/CurrentLayout.dwlt
	Library/expandedItems
	Library/metadata/55/55b240d47b4326f468ec214cfb7288d1
	Library/shadercompiler-1.log
# add font
# create combo system
# basic system of combo was created
# for use
# merge
Merge pull request #1 from tagia0212/master

コンボ機能