Collision Point Sets for Bug 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project 2/Problem 1/bug.py