ビルドエラーの解決
Merge branch 'master' of https://github.com/LimeStreem/MagicalFPS

Conflicts:
	MagicalFPS/MagicalFPS.csproj
	MagicalFPS/obj/Debug/MagicalFPS.csproj.FileListAbsolute.txt