From 298fa7d9b3f8adad70ddd9813c18e09bafe2faec Mon Sep 17 00:00:00 2001
From: aah13002 <aaron.huang@uconn.edu>
Date: Mon, 28 Mar 2016 17:29:08 -0400
Subject: [PATCH] conflict merge test

---
 src/model/Player.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/Player.java b/src/model/Player.java
index d666dd7..1be9e35 100644
--- a/src/model/Player.java
+++ b/src/model/Player.java
@@ -4,7 +4,7 @@
 
 public class Player {
 	private ArrayList<Piece> pieces;
-	private String name;
+	private String _name;
 	
 	public Player(String name) {
 		this.name = name;