Before the data model

diff --git a/.gitignore b/.gitignore
index 056f98764598463dc240714c96d5d93aca5e1bc9..b00c2c833231a37cb23cb79b98d010b3ac77b720 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /lib
 /test-result
 /logs
+*.swp

diff --git a/app/views/Application/index.html b/app/views/Application/index.html
index 9908dd908ac2aa850a4fa5771ef034ed9f915b01..2f2897b619266b2a417d97e0e4fab8996f42e359 100644 (file)
--- a/app/views/Application/index.html
+++ b/app/views/Application/index.html
@@ -1,4 +1,4 @@
 #{extends 'main.html' /}
 #{set title:'Home' /}
 
-#{welcome /}
\ No newline at end of file
+<h1>The main page will be here</h1>

diff --git a/conf/application.conf b/conf/application.conf
index 80326b9b0771f19feff767310c7d04b4fd12f730..78bb3bb73a11e651b5d0f6f7dc3903a06d75edcc 100644 (file)
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -82,7 +82,7 @@ date.format=yyyy-MM-dd
 # To quickly set up a development database, use either:
 #   - mem : for a transient in memory database (H2 in memory)
 #   - fs  : for a simple file written database (H2 file stored)
-# db=mem
+db=mem
 #
 # To connect to a local MySQL5 database, use:
 # db=mysql://user:pwd@host/database