Added rabbit, and player health

diff --cc include/entities.h
index 2a9a62b89767062347db363351d69b5e2ccbc88b,537ed499d61244b624fa13442f7ef9baafac0545..fc2f35ca06bf2b8084a3d4359c86b0dbe08c4560
--- 1/include/entities.h
--- 2/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

diff --cc main.cpp
Simple merge