took shop position out of item and into shop
took available and grid position out of item and into shop
added collidable
Merge branch 'megan'
Merge branch 'input'