Merge pull request #11 from Muelsby/master

rats blink red when hit
Changed the hit logic by adding a damage state. Damage state flashes
independent of animation now, this should be the same for all mobs.
Updated the rat look time, also updated the rat image so the look isn't
so jumpy. I'll do the clean ones later.
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/thwack/controller/RatVsWeaponHandler.java
	core/src/thwack/model/Entity.java
	core/src/thwack/model/Player.java
	core/src/thwack/model/Rat.java
	core/src/thwack/model/Sword.java
	core/src/thwack/screen/GameScreen.java
	core/src/thwack/view/RatRenderer.java
Changed the hit logic by adding a damage state. Damage state flashes
independent of animation now, this should be the same for all mobs.
Updated the rat look time, also updated the rat image so the look isn't
so jumpy. I'll do the clean ones later.

updated for git problems. stupid git
Revert "Changed the hit logic by adding a damage state. Damage state flashes"

This reverts commit 907503211b4fea75a732a56e29fb89823df1749c.
Revert "Revert "Changed the hit logic by adding a damage state. Damage state flashes""

This reverts commit 861c019daa8ed293cab4ed2dd4984304b16130c7.
Revert "Changed the hit logic by adding a damage state. Damage state flashes"

This reverts commit 907503211b4fea75a732a56e29fb89823df1749c.
Revert "Revert "Changed the hit logic by adding a damage state. Damage state flashes""

This reverts commit 574e9df93cb7759705e82600ded1ee0f0032f7f3.
Removed android code