testing commitment
Update Predator.java
Update Environment.java
Update Prey.java
Merge pull request #1 from atyniguez/master

Update Predator.java
Update Environment.java
Update Predator.java

change from rose
Update Predator.java
Update Predator.java
Merge pull request #2 from matthewporal/master

trial pull request
Update Prey.java
Merge pull request #5 from Jennifer-Maister/master

Update Prey.java
test ATY from desktop
HELOOO
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Predation/Predator.java
Merge branch 'master' of https://github.com/PatrickPata/Predation
comment by t3rK
trying again
trial terk
masakit mareject plz p0h