Ignoring my NetBeans configuration directory
Merge remote-tracking branch 'upstream/master'
Changed the "draw" msg format, added a "shape" object
Fig.2 is drawing + remove the iostream include in vibeswindow
Merge pull request #4 from nicolaje/master

More general msg format