only mapPopulate empty db

.gitignore

@@ -1 +1,2 @@
 logs/
+database.sqlite3

app.lua

@@ -13,13 +13,13 @@ app:enable("etlua")
 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}
+	self.text = "Map is already initialized. Beginning game."
+	self.isPopulated = mapFunc:mapExists(map)
+	if not self.isPopulated then
+        mapFunc:populate(map)
+        self.text = "Populated map."
+    end
+	return {self.text, layout = false}
 end)
 
 app:get("/", function(self)
@@ -42,41 +42,3 @@ end)
 
 return app
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

config.lua

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

lua_scripts/map.lua

@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-
-
 local map = {
     map_tiles = {
         {"-", "-", "w", "w", "-", "-", "-", "-", "-", "-"},
@@ -21,20 +18,18 @@ 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
 		end
+	end,
+	mapExists = function(self, map)
+	    local f = map:select("limit 1")
+	    if not f[1] then
+	        return false
+	    else
+	     return true
+	    end
 	end
 }
 local tiles = {}