Added ShapedObject
Merge branch 'master' of https://github.com/karimnaaji/crisis-simulation