working on world
merge clean
Merge branch 'master' of github.com:glawson0/twoheadedogre

Conflicts:
	twoheadedogre/GrassWorld.java
	twoheadedogre/project.greenfoot
knights behave civily now