diff --git a/.gi b/.gi
new file mode 100644
index 00000000..f885de5f
--- /dev/null
+++ b/.gi
@@ -0,0 +1,7 @@
+:X
+Merge branch 'master' of https://bitbucket.org/Terminon/tippspiel
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.
diff --git a/pfosten/resources/views/tipps/index.blade.php b/pfosten/resources/views/tipps/index.blade.php
index e241fffe..18a461b8 100755
--- a/pfosten/resources/views/tipps/index.blade.php
+++ b/pfosten/resources/views/tipps/index.blade.php
@@ -69,9 +69,9 @@
                                 <!-- 4 in 1 functionality -->
 
                                 @if(App\Round::hasLockedGame($round->id)!=true)
-                                    @if (Auth::user()->admin)
+
                                         <a href="/tipps/edit4/{{$game->round_id}}">Runde Tippen</a>
-                                    @endif
+
                                 @endif