powerups done except for respawning
Merge branch 'master' of https://github.com/twcus/CS354r-Whrilybirds

Conflicts:
	Heli.cpp
	Heli.h