starting adding solids
Merge branch 'master' into tucker
moved GridEntity's children's map to GridEntity
Merge branch 'master' of github.com:tlein/GameJam2013