fixed inventory problems and added some back logic
 fixed merge
Merge pull request #64 from jennwu/master

fixed inventory problems and added some back logic