Resolved merge conflict

1 files changed, 7 insertions, 2 deletions

diff --git a/README.md b/README.md
index 01f3c655..292c849a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This contains the code for the Bayesian Network Webserver (BNW).
 
-The master branch will be the stable version of the code for running with GeneNetwork. The original BNW website is compbio.uthsc.edu/BNW, which currently redirects to BNW_1.3.
+The master branch will be the stable version of the code for running with GeneNetwork. The BNW website is compbio.uthsc.edu/BNW; the GeneNetwork version is at: bnw.genenetwork.org.
 
 There are a couple of files in the info_files directory that provide descriptions of the BNW code and other information.
 
@@ -15,5 +15,10 @@ There are five branches.
 
 4) genenet6_final_1.3: This is the final version of BNW on the GENENET6 server.
 
-5) genenet8_initial_1.3: This is the working version of BNW on GENENET8 when we transitioned to that server.
+5) genenet8_initial_1.3: This is the working version of BNW on GENENET8 when we transitioned to that server. 
+   A couple of notes about this version.
+   - This version writes files created by users running BNW to /var/lib/genenet/bnw. 
+   - The structure learning package needs to be installed in /var/lib/genenet/bnw. The files in var_lib_genenet_bnw need to be copied to /var/lib/genenet/bnw and build.sh should be run there.
+   - There is a python environment on GENENET8 that is used by BNW. This is in bnw-env, but I am not sure how well this will transition to other servers.
+