included sample plot in demo
included sample plot in demo
included sample plot in demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
included sample plot in demo
Merge branch 'master' into workingcopy

Conflicts:
	.idea/workspace.xml
included sample plot in demo
included sample plot in demo
included sample plot in demo