take proper damage and some other fixes
Merge branch 'master' of https://github.com/twcus/CS354r-Whrilybirds

Conflicts:
	Whirlybirds.cpp