비트마스크 끝
Merge remote-tracking branch 'origin/master'

Conflicts:
	Stage.cpp