Added circle, triangle, and cruciform to simulator.
Merge pull request #3 from nick0210/master

Added circle, triangle, and cruciform to simulator.