Merge local version and GitHub version

README.md

@@ -21,7 +21,7 @@ Wanna build your own level? Great! Here's how to do it:
 1. Run the game – the easiest way to do so is to run `godot scenes/main.tscn` from the project directory.
 1. Get a bit familiar with the levels which are currently there.
 1. Take a look into the `levels` directory. It's split into chapters, and each level is a file.
-1. Make a copy of an existing level or start writing your own. See the documention of the format below.
+1. Make a copy of an existing level or start writing your own. See the documentation of the format below.
 1. Write and test your level. If you're happy with it, feel free to send it to us in a pull request! <3
 
 ### Level format

levels/index/add

@@ -35,4 +35,4 @@ test "$(git show main^:c)" != "c"
 
 [congrats]
 
-Well done! Try tavelling between the commits using `git checkout`, so you can look at their contents again!
+Well done! Try travelling between the commits using `git checkout`, so you can look at their contents again!

levels/shit-happens/reflog

@@ -5,9 +5,9 @@ cards = checkout reflog
 
 Say you were looking at something in the past, and then switched back to the main branch.
 
-But then, you got reaaally distracted, and after your lunch break, you can't remember on which commit in the past you were before. How can you find out?
+But then, you got reaaally distracted, and after your lunch break, you can't remember which past commit you were on before. How can you find out?
 
-There's a convenient command that shows you all the places your HEAD did point to in the past:
+There's a convenient command that shows you all the places your HEAD has pointed to in the past:
 
     git reflog
 

levels/stash/stash-merge

@@ -39,7 +39,7 @@ git add recipe
 
 [win]
 
-# Did you resolve the confict and commit?
+# Did you resolve the conflict and commit?
 { git show HEAD | grep "Flour"; } && { git show HEAD | grep "Salt"; }
 
 # Did you clear stash stack?

scenes/game.gd

@@ -74,7 +74,7 @@ func shell_received(text):
 
 func _notification(what):
 	if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
-		#get_tree().quit() # default behavio
+		#get_tree().quit() # default behavior
 		get_tree().change_scene("res://scenes/survey.tscn")