diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 7926c794..55510ed2 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -22,3 +22,15 @@ $factory->define(App\User::class, function (Faker\Generator $faker) {
         'remember_token' => str_random(10),
     ];
 });
+
+$factory->define(App\Veranstaltung::class, function(Faker\Generator $faker) {
+
+	$date = $faker->dateTime($min = 'now');
+	return [
+		'name' => $faker->randomElement($array = array('Theaterstück 1', 'Probe 5', 'Sinfonieorchester 20')),
+		'beginn' => $date,
+		'ende' => $date->add(new DateInterval("PT4H")),
+		'gaeste' => $faker->numberBetween($min = 100, $max = 800),
+		'hinweise' => $faker->text()
+	];
+});
diff --git a/database/migrations/2017_06_10_134148_veranstaltung_table_add_ende.php b/database/migrations/2017_06_10_134148_veranstaltung_table_add_ende.php
new file mode 100644
index 00000000..211e6144
--- /dev/null
+++ b/database/migrations/2017_06_10_134148_veranstaltung_table_add_ende.php
@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateArbeitszeitsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}
diff --git a/database/migrations/2017_06_10_134504_veranstaltung_table_add_ende.php b/database/migrations/2017_06_10_134504_veranstaltung_table_add_ende.php
new file mode 100644
index 00000000..ae31e2ae
--- /dev/null
+++ b/database/migrations/2017_06_10_134504_veranstaltung_table_add_ende.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class VeranstaltungTableAddEnde extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('veranstaltungen', function (Blueprint $table) {
+            $table->dateTime('ende')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('veranstaltungen', function (Blueprint $table) {
+            $table->dropColumn('ende');
+        });
+    }
+}
diff --git a/database/seeds/VeranstaltungSeeder.php b/database/seeds/VeranstaltungSeeder.php
new file mode 100644
index 00000000..a6d881ce
--- /dev/null
+++ b/database/seeds/VeranstaltungSeeder.php
@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class VeranstaltungSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        factory(App\Veranstaltung::class, 10)->create();
+    }
+}
diff --git a/package.json b/package.json
index 83294b63..4274311a 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "axios": "^0.15.3",
-    "bootstrap-sass": "^3.3.7",
+    "bootstrap": "^4.0.0-alpha.6",
     "cross-env": "^3.2.3",
     "jquery": "^3.1.1",
     "laravel-mix": "0.*",
diff --git a/webpack.mix.js b/webpack.mix.js
index 3e6f5712..e4d1751a 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -11,5 +11,9 @@ const { mix } = require('laravel-mix');
  |
  */
 
-mix.js('resources/assets/js/app.js', 'public/js')
+mix.scripts([
+	'node_modules/jquery/dist/jquery.min.js',	
+	'node_modules/bootstrap/dist/js/bootstrap.js',
+	'resources/assets/js/app.js'
+	], 'public/js/app.js')
    .sass('resources/assets/sass/app.scss', 'public/css');