diff --git a/.gitignore b/.gitignore
index 172e300..6ec157c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@
 labswp_2019_sose_geocaching.iml
 .idea/modules
 
+# public folder
+src/main/resources/public
 
 
 # Gradle
diff --git a/build.gradle b/build.gradle
index 69c8d4c..8310c4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,12 @@ dependencies {
     runtimeOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'mysql:mysql-connector-java'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    //JPA
+    compile 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    //MariaDB
+    implementation 'org.mariadb.jdbc:mariadb-java-client'
 }
 
 node {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 29b1804..436306b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+#Wed Mar 20 19:26:07 CET 2019
+=======
 #Tue Mar 19 20:48:09 CET 2019
+>>>>>>> frontend/timo
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
new file mode 100644
index 0000000..0305341
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
@@ -0,0 +1,65 @@
+package hhn.labsw.bugageocaching.entities;
+
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table
+public class Cache {
+
+  @Id
+  @GeneratedValue
+  private int id;
+
+  private String name;
+  private String description;
+  private int rankingPoints;
+
+  @OneToMany
+  private List<Station> stationen = new ArrayList<>();
+
+  public Cache() {
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public int getRankingPoints() {
+    return rankingPoints;
+  }
+
+  public void setRankingPoints(int rankingPoints) {
+    this.rankingPoints = rankingPoints;
+  }
+
+  public List<Station> getStationen() {
+    return stationen;
+  }
+
+  public void setStationen(ArrayList<Station> stationen) {
+    this.stationen = stationen;
+  }
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Reward.java b/src/main/java/hhn/labsw/bugageocaching/entities/Reward.java
new file mode 100644
index 0000000..c83cc88
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Reward.java
@@ -0,0 +1,37 @@
+package hhn.labsw.bugageocaching.entities;
+
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table
+public class Reward {
+
+  @Id
+  @GeneratedValue
+  private int id;
+
+  private String rewardDescription;
+
+  public Reward() {
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  public String getRewardDescription() {
+    return rewardDescription;
+  }
+
+  public void setRewardDescription(String rewardDescription) {
+    this.rewardDescription = rewardDescription;
+  }
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Station.java b/src/main/java/hhn/labsw/bugageocaching/entities/Station.java
new file mode 100644
index 0000000..0acfaa9
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Station.java
@@ -0,0 +1,53 @@
+package hhn.labsw.bugageocaching.entities;
+
+
+import javax.persistence.*;
+
+@Entity
+@Table
+public class Station {
+
+  @Id
+  @GeneratedValue
+  private int id;
+
+  private String description;
+  private double longitude;
+  private double lattitude;
+
+  public Station() {
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public double getLongitude() {
+    return longitude;
+  }
+
+  public void setLongitude(double longitude) {
+    this.longitude = longitude;
+  }
+
+  public double getLattitude() {
+    return lattitude;
+  }
+
+  public void setLattitude(double lattitude) {
+    this.lattitude = lattitude;
+  }
+
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java
new file mode 100644
index 0000000..b480c64
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/CacheRepository.java
@@ -0,0 +1,7 @@
+package hhn.labsw.bugageocaching.repositories;
+
+import hhn.labsw.bugageocaching.entities.Cache;
+import org.springframework.data.repository.CrudRepository;
+
+public interface CacheRepository extends CrudRepository<Cache, Integer> {
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java
new file mode 100644
index 0000000..ca51b18
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/RewardRepository.java
@@ -0,0 +1,7 @@
+package hhn.labsw.bugageocaching.repositories;
+
+import hhn.labsw.bugageocaching.entities.Reward;
+import org.springframework.data.repository.CrudRepository;
+
+public interface RewardRepository extends CrudRepository<Reward, Integer> {
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java
new file mode 100644
index 0000000..c902ec5
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/StationRepository.java
@@ -0,0 +1,7 @@
+package hhn.labsw.bugageocaching.repositories;
+
+import hhn.labsw.bugageocaching.entities.Station;
+import org.springframework.data.repository.CrudRepository;
+
+public interface StationRepository extends CrudRepository<Station, Integer> {
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 0c5ee2a..3fd5f91 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,5 @@
-#spring.jpa.hibernate.ddl-auto=none
-#spring.datasource.url=jdbc:mysql://seserver.se.hs-heilbronn.de:3306/BuGaCommonTest
-#spring.datasource.username=BuGaTestUser
-#spring.datasource.password=TestPw
\ No newline at end of file
+spring.datasource.url=jdbc:mariadb://seserver.se.hs-heilbronn.de:3406/buga19Geocaching
+spring.datasource.username=BuGa19GeocachingUser
+spring.datasource.password=GeocachingPw
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.jpa.hibernate.ddl-auto=update
\ No newline at end of file
diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html
index fb97404..ac44586 100644
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -1,4 +1,17 @@
 <!DOCTYPE html>
+<<<<<<< HEAD
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+    <h1>Hello World</h1>
+</body>
+<div id=app>2</div> <!--Vue js muss App heißen-->
+</html>
+
+=======
 <html>
 <head><title>labswp_2019_sose_geocaching_frontend</title>
     <meta charset=utf-8>
@@ -24,4 +37,5 @@
 <script type=text/javascript src=js/runtime.bf83edfa.js></script>
 <script type=text/javascript src=js/vendor.9feacb96.js></script>
 </body>
-</html>
\ No newline at end of file
+</html>
+>>>>>>> frontend/timo