diff --git a/GameServer/alert-config.xml b/GameServer/alert-config.xml
index 59d46d7..5202c42 100644
--- a/GameServer/alert-config.xml
+++ b/GameServer/alert-config.xml
@@ -22,5 +22,9 @@
 			<priority>1</priority>
 		</email>
 	</user>
+<<<<<<< HEAD
 </alert>
 
+=======
+</alert>
+>>>>>>> upstream/master
diff --git a/GameServer/src/org/moparscape/msc/gs/Cache.java b/GameServer/src/org/moparscape/msc/gs/Cache.java
new file mode 100644
index 0000000..f18d06b
--- /dev/null
+++ b/GameServer/src/org/moparscape/msc/gs/Cache.java
@@ -0,0 +1,27 @@
+package org.moparscape.msc.gs;
+
+import java.util.Map;
+
+import org.apache.commons.collections.map.LRUMap;
+
+/**
+ * A basic cache backed by a {@link LRUMap}.
+ * 
+ * @author CodeForFame
+ * 
+ */
+public class Cache<K, V> {
+
+	// Shitty commons and their failure to support generics...
+	@SuppressWarnings("unchecked")
+	private Map<K, V> cache = new LRUMap();
+
+	public V get(K key) {
+		return cache.get(key);
+	}
+
+	public void put(K key, V value) {
+		cache.put(key, value);
+	}
+
+}