Collision - the natural limit of following.
Merge branch 'master' of https://github.com/Neurochrom/cowjourney

Conflicts:
	js/world.js