From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Tue, 13 Oct 2015 12:51:49 +0000 (-0400)
Subject: Added rabbit, and player health
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=5adabb82443b9b10b25cdd8b4db3cfe890e36fa1;p=clyne%2Fgamedev.git

Added rabbit, and player health
---

5adabb82443b9b10b25cdd8b4db3cfe890e36fa1
diff --cc include/entities.h
index 2a9a62b,537ed49..fc2f35c
--- a/include/entities.h
+++ b/include/entities.h
@@@ -97,5 -94,5 +97,10 @@@ ENTITY TYPE
  |->1 Merchant
  |
  2 MOBS
++<<<<<<< HEAD
 +|->1 Rabbit
- **/
++**/
++=======
+ |->1 Skirl
+ **/
++>>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187