From d31541279ee0cc7c7b207ceb46f9f824986a7917 Mon Sep 17 00:00:00 2001
From: aah13002 <aaron.huang@uconn.edu>
Date: Mon, 28 Mar 2016 17:29:50 -0400
Subject: [PATCH] testing merging

---
 src/model/Player.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/model/Player.java b/src/model/Player.java
index d666dd7..8f20497 100644
--- a/src/model/Player.java
+++ b/src/model/Player.java
@@ -4,10 +4,10 @@
 
 public class Player {
 	private ArrayList<Piece> pieces;
-	private String name;
+	private String name_;
 	
 	public Player(String name) {
-		this.name = name;
+		this.name_ = name;
 		this.pieces = new ArrayList<Piece>();
 	}
 	
@@ -20,10 +20,10 @@ public ArrayList<Piece> getPieces() {
 	}
 	
 	public String getName() {
-		return name;
+		return name_;
 	}
 	
 	public void setName(String name) {
-		this.name = name;
+		this.name_ = name;
 	}
 }