Merge branch 'daniel-server'

# Conflicts:
#	public/scss/main.scss
This commit is contained in:
Danila Fedorin 2018-06-12 22:51:31 -07:00
commit 7d548c390a
1 changed files with 1 additions and 1 deletions

View File

@ -1,5 +1,5 @@
<ul class="game-instructions">
<li id="welcome">Welcome to our simulation of Go!</li>
<li id="welcome">Welcome to our simulation of Go! <a href="/about">Meet the creators.</a></li>
<li id="welcome">Defeat your opponent by earning more territory.</li>
<li id="welcome">"Capture" dots of the opposite color by surrounding them.</li>
<li id="welcome">Create a game by filling out the fields below, giving the next player a password in "Their password."</li>