Interactive curves wooo!!
Merge branch 'master' of https://github.com/MariaBarrett/VIPAssignment3

Conflicts:
	main.py
More merging
Merge branch 'master' of https://github.com/MariaBarrett/VIPAssignment3

Conflicts:
	main.py