test fixed
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/org/ludumdare28/BerryEatingTest.java