Made all shapes a single master shape message.
Merge pull request #1 from jon-weisz/master

Made all shapes a single master shape message.