changed dat Squirrel class again!
changed squirrel :P
Merge branch 'master' of https://github.com/lsom/acornchase.git

Conflicts:
	acornchase/src/acornchase/model/Squirrel.java
Merge branch 'master' of https://github.com/lsom/acornchase.git
hasCollidedWith was wrong and now it isn't! Hopefully