cus i have to
Merge branch 'master' of https://github.com/MariaBarrett/VIPAssignment3

Conflicts:
	splinedraw.pyc