refactor
Merge branch 'master' of https://github.com/seanastephens/ParanoidPosies.git
Merge branch 'master' of https://github.com/seanastephens/ParanoidPosies.git
Fight Strategy-- only works for bees atm
Merge branch 'master' of https://github.com/seanastephens/ParanoidPosies.git

Conflicts:
	ParanoidPosies/src/model/Bee.java