adds to gui and removes flags
fixes merge conflicts
Merge pull request #81 from biversen21/develop

adds gui controls for new fancy edges