Added new shapes to the toolbox

Jira Link: http://tintin.cs.indiana.edu:8091/browse/PSU-29