modified:   Box.cpp
	modified:   Box.h
	modified:   Computer.cpp
	modified:   Computer.h
	modified:   Consts.h
	modified:   DrawAble.cpp
	modified:   Menu.cpp
Merge branch 'master' of github.com:legionth/DevGame

Conflicts:
	Box.h
	Consts.h

	modified:   Action.cpp
	modified:   Action.h
	modified:   Box.cpp
	modified:   Box.h
	new file:   BoxMenu.cpp
	new file:   BoxMenu.h
	modified:   BuyMenu.cpp
	modified:   BuyMenu.h
	modified:   ComputerMenu.cpp
	modified:   Consts.h
	modified:   Debug/DevGame.Build.CppClean.log
	modified:   Debug/DevGame.log
	modified:   DevMenu.cpp
	modified:   DevMenu.h
	modified:   Game.cpp
	modified:   Game.h
	modified:   Inventory.cpp
	modified:   Inventory.h
	modified:   Item.cpp
	modified:   Item.h
	modified:   ItemHoldButton.cpp
	modified:   ItemHoldButton.h
	modified:   Menu.cpp
	modified:   Menu.h
	modified:   Player.cpp
	modified:   Player.h
	modified:   Quest.cpp
	modified:   Quest.h
	new file:   SellButton.cpp
	new file:   SellButton.h
	new file:   book_calculator.png
	new file:   book_hello_world.png
	new file:   button_buy_menu.png
	new file:   button_holder.png
	new file:   button_sell.png
	new file:   menu_box.png
	new file:   menu_buy.png
	new file:   menu_inventory.png