Merge remote-tracking branch 'upstream/master'

JNPRAutomate · May 4, 2015 · c80450b · c80450b
2 parents b1703e5 + 3bb929b
commit c80450b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -45,10 +45,11 @@ The course is divided into multiple steps.
 **Proctor Instructions**
 
 -	[Proctor Instructions](https://github.com/JNPRAutomate/JNPRAutomateDemo-Student/blob/master/docs/proctorconfiguration.md)
+- [Classrom Handout](https://github.com/JNPRAutomate/JNPRAutomateDemo-Student/tree/master/handouts)
+
 
 TODO
 ====
 
 1.	Make standalone
 2.	Remove remote license requirements
-3.	Remove server requirements
diff --git a/handouts/AutomationDemoTopology.pdf b/handouts/AutomationDemoTopology.pdf
diff --git a/handouts/AutomationDemoTopology.pptx b/handouts/AutomationDemoTopology.pptx
diff --git a/handouts/README.md b/handouts/README.md
@@ -0,0 +1,3 @@
+# Classroom Handout
+
+This document provides a simple topology diagram with a set of commonly used commands. Provided in both Power Point and PDF formats.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Classroom Handout

		This document provides a simple topology diagram with a set of commonly used commands. Provided in both Power Point and PDF formats.