Added code to detect sheep being in pen, moved rabbits
Merge branch 'master' of https://github.com/depstein/ggj-2014

Conflicts:
	code/Assets/Images/environment/forest-bush.png.meta