worked on some stuff DONT EVEN REMEMBER OKAY
Merge branch 'master' of github.com:Paamayim/cs349-a1

Conflicts:
	Helicopter.cpp
	Projectile.cpp