수정
Merge branch 'master' of https://github.com/tiredc9/noah

Conflicts:
	Classes/GameLayer.cpp