added income, added more water
Merge branch 'master' of https://github.com/kyldvs/wwf
Changed movement to not go into walls