test

test
Merge branch 'master' of https://github.com/ky525/Game

Conflicts:
	GamePC/GamePC/main.cpp