update
Merge branch 'master' of https://github.com/Data1010/Visualization

Conflicts:
	Untitled2.py