バレットです。
Merge branch 'master' of https://github.com/AT13B02/GL into dev/bullet

Conflicts:
	framework/framework.vcxproj
	framework/sources/common/math/quaternion/quaternion.h
	framework/sources/interface/character/bullet/bullet.cpp
	framework/sources/interface/character/bullet/bullet.h
	framework/sources/interface/character/character_manager.cpp
	framework/sources/interface/character/character_manager.h
	framework/sources/interface/character/player/player.cpp
	framework/sources/scene/game/scene_game.cpp
Merge remote-tracking branch 'origin/dev/bullet'

Conflicts:
	framework/framework.vcxproj.filters