moving edges
has edge bugs
starts adding dat gui
fancy edges stable
fix merge conflicts
Merge pull request #75 from stevejs/feature/fancyEdges

Feature/fancy edges
prep for merge
fixes merge conflict
adds doc for particles
Merge branch 'feature/AddDatGui' into develop
adds dat.gui bower
adjusts circleCI timeout for grunt build
Merge pull request #78 from biversen21/develop

adds dat gui
Merge upstream/feature/new-globe into god-mode
fix broken merge
Merge pull request #79 from TGVarik/god-mode

merging in god-mode
adds to gui and removes flags
fixes merge conflicts
Merge pull request #81 from biversen21/develop

adds gui controls for new fancy edges
adds time multiplier to gui