fixed a few things
Merge branch 'master' of github.com:RockLobsters/Space-Traders
adding multiple of same item to cargo
single items in cargo
checking goodtype equality instead of pointer equality
Everything Traveling
finished save and load game methods in GameInstance
Merge branch 'master' into kristen