orz commend
Merge branch 'master' of https://github.com/pine0113/GameDesignFinal

Conflicts:
	Hello.cpp