project setting
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project_TouhouHataon/Project_TouhouHataon.userprefs
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 43c0017ce1fb04995c8a768d5041e39574c94096.
Revert "project setting"

This reverts commit 4d2a4e3203748630ce94f433bc677d39fc4feba7.