Merge gitlab.com:TheGamecraft/c-cms

Conflicts:
	.gitignore
	app/Http/Controllers/AdminController.php
	app/Providers/AppServiceProvider.php
	app/User.php
	artisan
	bootstrap/cache/.gitignore
	composer.lock
	config/app.php
	database/migrations/2014_10_12_000000_create_users_table.php
	readme.md
	resources/views/admin/dashboard.blade.php
	resources/views/auth/login.blade.php
	resources/views/layouts/admin/header.blade.php
	routes/web.php
	storage/app/.gitignore
	storage/app/public/.gitignore
	storage/framework/.gitignore
	storage/framework/cache/.gitignore
	storage/framework/sessions/.gitignore
	storage/framework/testing/.gitignore
	storage/framework/views/.gitignore
	storage/logs/.gitignore

database/migrations/2018_06_15_194206_create_tasks_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tasks', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('priority');
+            $table->string('body');
+            $table->boolean('completed')->default(false);          
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('tasks');
+    }
+}