Merge remote-tracking branch 'origin/master'

src/com/bayviewglen/zork/Entities/Enemy.java

@@ -1,5 +1,16 @@
 package com.bayviewglen.zork.Entities;
 
 public class Enemy {
+	int damageGiven; 
+	
+	public Enemy(){
+		super(); 
+		damageGiven = 10; 
+	}
+	
+	public Enemy(int damageGiven){
+		super(); 
+		this.damageGiven = damageGiven; 
+	}
 	
 }