Plotting solved. GUI improved.
Merge origin/master

Conflicts:
	src/GUI/MainFrame.java