testing
Merge branch 'master' of https://github.com/efriesen/CS270-Visualization

Conflicts:
	main.py