input stuff in WinState.cpp
deleted InventoryState h and cpp
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game States/InventoryState.cpp
	DestinyFalls/Source/Game States/InventoryState.h