inventory framework
cleaned up some bugs
cleaned up some bugs
Merged, hopefully resolved conflicts

Conflicts:
	Ship.cpp
	Ship.h