added collision detection
made the inventory bigger
Merge remote-tracking branch 'origin/master'