remove unused constants
Merge branch 'develop' into personalBranch
add ability to plot non-curved graphs
Merge branch 'non-curved-lines' into develop
Merge branch 'personalBranch' into develop