almost ready for public release

- merged release-candidate-2
- fix up documentation
- add web tutorial

docs/installation/INSTALL_MAC.md

@@ -24,7 +24,9 @@ First you need to download a large checkpoint file.
 3. Accept the terms and click Access Repository
 4. Download [sd-v1-4.ckpt (4.27 GB)](https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/blob/main/sd-v1-4.ckpt) and note where you have saved it (probably the Downloads folder). You may want to move it somewhere else for longer term storage - SD needs this file to run.
 
-While that is downloading, open Terminal and run the following commands one at a time, reading the comments and taking care to run the appropriate command for your Mac's architecture (Intel or M1).
+While that is downloading, open Terminal and run the following
+commands one at a time, reading the comments and taking care to run
+the appropriate command for your Mac's architecture (Intel or M1).
 
 Do not just copy and paste the whole thing into your terminal!
 
@@ -40,7 +42,6 @@ Do not just copy and paste the whole thing into your terminal!
 #
 # If you are familiar with python environments, you'll know there are other options
 # for setting up the environment - you are on your own if you go one of those routes.
-
 ##### BEGIN TWO DIFFERENT OPTIONS #####
 
 ### BEGIN OPTION 1: Installing alongside pyenv ###
@@ -73,10 +74,9 @@ curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o M
 # Clone the Invoke AI repo
 git clone https://github.com/invoke-ai/InvokeAI.git
 cd InvokeAI
+<<<<<<< HEAD
 
 ### WAIT FOR THE CHECKPOINT FILE TO DOWNLOAD, THEN PROCEED ###
->>>>>>> Updates INSTALL_MAC.md
-
 # We will leave the big checkpoint wherever you stashed it for long-term storage,
 # and make a link to it from the repo's folder. This allows you to use it for
 # other repos, and if you need to delete Invoke AI, you won't have to download it again.