chartDataController
merge again
Merge branch 'master' of https://github.com/wangzhizhen/SE_Lab4

Conflicts:
	src/controller/ChartDataController.java