modified:   BookcaseMenu.cpp
	modified:   Game.cpp
	modified:   Game.h
	modified:   Item.cpp
	modified:   Item.h
	modified:   ItemHoldButton_Select.cpp
	modified:   Quest.cpp
	new file:   framework_lib.h
Merge branch 'master' of https://github.com/legionth/DevGame

Conflicts:
	Quest.cpp

	modified:   Consts.h
	modified:   Consts.h~
	modified:   Game.cpp
	modified:   Game.cpp~
	modified:   Game.h
	modified:   Game.h~
	modified:   Player.cpp
	new file:   Player.cpp~
	modified:   Player.h
	modified:   Player.h~
	modified:   Quest.cpp
	modified:   Quest.cpp~
	modified:   Quest.h
	new file:   Quest.h~