fix merge conflicts

lua_scripts/map.lua

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 
 local map = {
@@ -20,6 +21,16 @@ local map = {
 					x = h,
 					y = i,
 					occupied_by_type = self.map_tiles[h][i],
+=======
+local map = {
+	populate = function(self, map)
+		for h=1,100 do 
+			for i=1,100 do
+				local tile = map:create({
+					x = h,
+					y = i,
+					occupied_by_type = "",
+>>>>>>> refs/remotes/origin/master
 					occupied_by_id = ""
 				})
 			end