begin drone/player collision detection
Merge branch 'master' of github.com:jonoerik/CSSA-GameJam-AJD-JEF

Conflicts:
	src/main.cpp