testing commitment
test ATY from desktop
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Predation/Predator.java
Merge branch 'master' of https://github.com/PatrickPata/Predation