Recovering lost changes during merge -> making sheep show X bitmap while being eaten and increasing time left.
Merge branch 'master' of https://github.com/marcusvsilveira/lehman-android

Conflicts:
	SheepHerder/src/edu/lehman/android/SheepHerderActivity.java
	SheepHerder/src/edu/lehman/android/domain/Fox.java
	SheepHerder/src/edu/lehman/android/views/GameSurfaceView.java