player.cppの編集
Merge branch 'master' of https://github.com/Turgure/Simulation_3D

Conflicts:
	Camera.cpp
	Player.cpp
	Stage.cpp
	Stage.h