Added layout and 2D shapes modules
Merge pull request #12 from peteruithoven/master

Added 2D shapes and layout modules