Merges and fixes merge conflicts for upstream master changes#598

Merged

lmccart merged 26 commits intoprocessing:renderersfrom indefinit:renderers

Apr 10, 2015

+2,219-6,677

Commits on Aug 18, 2014

working on encapsulated drawing contexts in prep for webgl
lauren mccarthy
committed
rearranging
lauren mccarthy
committed

Commits on Aug 19, 2014

checking for stroke and fill at beginning of shapes
lauren mccarthy
committed
Merge branch 'renderers' of github.com:lmccart/p5.js into renderers
lauren mccarthy
committed
stash
lauren mccarthy
committed
calling p5.graphics2d things properly
lauren mccarthy
committed
minor fix to string
lauren mccarthy
committed
p5.Image currently broken but pixels working
lauren mccarthy
committed

Commits on Dec 16, 2014

rough pass at webgl renderer and basic line drawing
indefinit
committed
merge 3d start
Lauren McCarthy
committed

Commits on Dec 23, 2014

working on merging recent for 2d
Lauren McCarthy
committed
fixes
Lauren McCarthy
committed

Commits on Dec 31, 2014

Merge branch 'master' of github.com:lmccart/p5.js into renderers
Lauren McCarthy
committed
updating signature for loadjson
Lauren McCarthy
committed

Commits on Jan 13, 2015

working on p5.Image with renderers
Lauren McCarthy
committed
creategraphics needs work
Lauren McCarthy
committed

Commits on Mar 10, 2015

adds tojis gl-matrix as submodule; intended for use with WebGl renderer
indefinit
committed

Commits on Mar 22, 2015

tweaks 3d sketch and renderer
indefinit
committed

Commits on Mar 27, 2015

removes gl-matrix submodule
indefinit
committed
adds Matrix class
indefinit
committed
Merge pull request processing#586 from indefinit/renderers
Lauren McCarthy
committed

Commits on Apr 3, 2015

Commits on Apr 10, 2015