fix merge conflicts

app.lua

@@ -14,7 +14,11 @@ app.layout = require "views.layout"
 
 app:post("/clickme", function(self)
 	self.plane = "P-38L"
+<<<<<<< HEAD
     mapFunc:populate(map)
+=======
+    mapFunc.populate(self, map)
+>>>>>>> refs/remotes/origin/master
 	return {self.plane, layout = false}
 end)
 

config.lua

@@ -4,6 +4,7 @@ config("development", {
   server = "nginx",
   code_cache = "off",
   num_workers = "1",
+  port = "1010"
   sqlite = {
     database = "database.sqlite3",
     -- open_flags = ...

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