dmc-2016 · sljszxjsz · Sep 6, 2016 · Sep 12, 2016 · Sep 12, 2016 · Sep 16, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,9 @@
 .vagrant
 .ipynb_checkpoints
-*~
+-*
+*~
+*.pyc
+checkpoint
+*.ckpt*
+*.3dm.rhl
+*.3dmbak
diff --git a/README.md b/README.md
@@ -193,6 +193,12 @@ When you are done working on the VM, go back to the Command Prompt or Terminal w
 2. Ctrl+D to exit out of SSH remote access
 3. type in the command `vagrant halt` to shut down the VM. This will shut down the machine, but keep all the files so you can work on them at a later time.
 
+-
+
+![setup](images/setup02.png)
+
+-
+
 Now, the next time you want to work on the VM, just follow the launching instructions again, using the commands:
 
     vagrant up
@@ -249,14 +255,25 @@ After the pull request has been made, you will be notified by email about the st
 
 The lab assignments may be edited and developed during the course of the semester. Therefore, it is very important that before you begin any assignment you first pull in any changes from the main project into your fork. Unfortunately this is not possible through the Github Desktop interface, but can be easily done with a few lines in the Git Shell, which allows you to enter git commands directly. 
 
-First, make sure there are not any uncommitted changes in your repo (the left pane should say 'No changes'). Next, open the Git Shell by clicking the setup icon in the top right corner, and select `Open in Git Shell`.
+First, make sure there are not any uncommitted changes in your repo (the left pane should say 'No changes'). 
+
+Next, **if you are using Windows**, open the Git Shell by clicking the setup icon in the top right corner, and select `Open in Git Shell`.
 
 -
 
 ![GitHub account](images/github06.png)
 
 -
 
+**If you are using MacOSX**, open the Terminal by right-clicking on the repository's name in the left pane and selecting `Open in Terminal`.
+
+-
+
+![GitHub account](images/github11.png)
+<!--![GitHub account](images/github09.png)-->
+
+-
+
 Now, type in the following commands to set the remote master repository, and pull in changes to your local fork:
 
     git remote add upstream https://github.com/dmc-2016/dmc.git

diff --git a/images/github11.png b/images/github11.png
diff --git a/images/github12.png b/images/github12.png
diff --git a/notebooks/examples/box detection/.DS_Store b/notebooks/examples/box detection/.DS_Store
diff --git a/notebooks/examples/box detection/00_image clipping.ipynb b/notebooks/examples/box detection/00_image clipping.ipynb
diff --git a/notebooks/examples/box detection/01_build model.ipynb b/notebooks/examples/box detection/01_build model.ipynb
diff --git a/notebooks/examples/box detection/02_use model.ipynb b/notebooks/examples/box detection/02_use model.ipynb
diff --git a/notebooks/examples/box detection/data/.DS_Store b/notebooks/examples/box detection/data/.DS_Store
diff --git a/notebooks/examples/box detection/data/extra/004.jpg b/notebooks/examples/box detection/data/extra/004.jpg
diff --git a/notebooks/examples/box detection/data/extra/005.jpg b/notebooks/examples/box detection/data/extra/005.jpg
diff --git a/notebooks/examples/box detection/data/extra/006.jpg b/notebooks/examples/box detection/data/extra/006.jpg
diff --git a/notebooks/examples/box detection/data/extra/007.jpg b/notebooks/examples/box detection/data/extra/007.jpg
diff --git a/notebooks/examples/box detection/data/extra/008.jpg b/notebooks/examples/box detection/data/extra/008.jpg
diff --git a/notebooks/examples/box detection/data/extra/009.jpg b/notebooks/examples/box detection/data/extra/009.jpg
diff --git a/notebooks/examples/box detection/data/extra/010.jpg b/notebooks/examples/box detection/data/extra/010.jpg
diff --git a/notebooks/examples/box detection/data/images/001.jpg b/notebooks/examples/box detection/data/images/001.jpg
diff --git a/notebooks/examples/box detection/data/images/002.jpg b/notebooks/examples/box detection/data/images/002.jpg
diff --git a/notebooks/examples/box detection/data/images/003.jpg b/notebooks/examples/box detection/data/images/003.jpg
diff --git a/notebooks/examples/box detection/data/labels/001.jpg b/notebooks/examples/box detection/data/labels/001.jpg
diff --git a/notebooks/examples/box detection/data/labels/002.jpg b/notebooks/examples/box detection/data/labels/002.jpg
diff --git a/notebooks/examples/box detection/data/labels/003.jpg b/notebooks/examples/box detection/data/labels/003.jpg
diff --git a/notebooks/examples/building heights/00 - imageProcessingForTrain.ipynb b/notebooks/examples/building heights/00 - imageProcessingForTrain.ipynb
diff --git a/notebooks/examples/building heights/01 - CNN_classification.ipynb b/notebooks/examples/building heights/01 - CNN_classification.ipynb
diff --git a/notebooks/examples/building heights/01 - CNN_classification_6.ipynb b/notebooks/examples/building heights/01 - CNN_classification_6.ipynb
diff --git a/notebooks/examples/housing prices/data/Chicago11.csv b/notebooks/examples/housing prices/data/Chicago11.csv
diff --git a/notebooks/examples/housing prices/data/NYCnumber.csv b/notebooks/examples/housing prices/data/NYCnumber.csv