Merge branch 'master' of https://github.com/aguibert/IASTATE

Conflicts:
	04_ExamplesSimple/.project
	05_ExamplesIntermediate/.project
	319_01_Swing/.classpath
	319_01_Swing/.project
	319_01_Swing/.settings/org.eclipse.jdt.core.prefs
	319_01_Swing/.settings/org.eclipse.jdt.ui.prefs
	319_01_Swing/forms-1.3.0-src.zip
	319_01_Swing/forms-1.3.0.jar
	319_01_Swing/src/coms319/lab1/HelloWorldSwing.java
	319_01_Swing/src/coms319/lab1/HelloWorldSwing2.java
	319_01_Swing/src/coms319/lab1/HelloWorldSwing3.java
	319_02_Swing/.project
	319_04_ExamplesSimple/.project
	319_05_ExamplesIntermediate/.project
	319_HelloWorldSwing/.classpath
	319_HelloWorldSwing/.project
	319_HelloWorldSwing/.settings/org.eclipse.jdt.core.prefs
	319_HelloWorldSwing/.settings/org.eclipse.jdt.ui.prefs
	319_HelloWorldSwing/forms-1.3.0-src.zip
	319_HelloWorldSwing/forms-1.3.0.jar
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing.java
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing2.java
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing3.java
	319_Lab01/.classpath
	319_Lab01/.project
	319_Lab01/.settings/org.eclipse.jdt.core.prefs
	319_Lab01/.settings/org.eclipse.jdt.ui.prefs
	319_Lab01/forms-1.3.0-src.zip
	319_Lab01/forms-1.3.0.jar
	319_Lab01/src/coms319/lab1/HelloWorldSwing.java
	319_Lab01/src/coms319/lab1/HelloWorldSwing2.java
	319_Lab01/src/coms319/lab1/HelloWorldSwing3.java
Merge branch 'master' of https://github.com/aguibert/IASTATE

Conflicts:
	04_ExamplesSimple/.project
	05_ExamplesIntermediate/.project
	319_01_Swing/.classpath
	319_01_Swing/.project
	319_01_Swing/.settings/org.eclipse.jdt.core.prefs
	319_01_Swing/.settings/org.eclipse.jdt.ui.prefs
	319_01_Swing/forms-1.3.0-src.zip
	319_01_Swing/src/coms319/lab1/HelloWorldSwing.java
	319_01_Swing/src/coms319/lab1/HelloWorldSwing2.java
	319_01_Swing/src/coms319/lab1/HelloWorldSwing3.java
	319_02_Swing/.project
	319_04_ExamplesSimple/.project
	319_05_ExamplesIntermediate/.project
	319_HelloWorldSwing/.classpath
	319_HelloWorldSwing/.project
	319_HelloWorldSwing/.settings/org.eclipse.jdt.core.prefs
	319_HelloWorldSwing/.settings/org.eclipse.jdt.ui.prefs
	319_HelloWorldSwing/forms-1.3.0-src.zip
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing.java
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing2.java
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing3.java
	319_Lab01/.classpath
	319_Lab01/.project
	319_Lab01/.settings/org.eclipse.jdt.core.prefs
	319_Lab01/.settings/org.eclipse.jdt.ui.prefs
	319_Lab01/forms-1.3.0-src.zip
	319_Lab01/src/coms319/lab1/HelloWorldSwing.java
	319_Lab01/src/coms319/lab1/HelloWorldSwing2.java
	319_Lab01/src/coms319/lab1/HelloWorldSwing3.java
Merge branch 'master' of https://github.com/aguibert/IASTATE

Conflicts:
	04_ExamplesSimple/.project
	05_ExamplesIntermediate/.project
	319_01_Swing/.classpath
	319_01_Swing/.project
	319_01_Swing/.settings/org.eclipse.jdt.core.prefs
	319_01_Swing/.settings/org.eclipse.jdt.ui.prefs
	319_01_Swing/forms-1.3.0-src.zip
	319_01_Swing/forms-1.3.0.jar
	319_01_Swing/src/coms319/lab1/HelloWorldSwing.java
	319_01_Swing/src/coms319/lab1/HelloWorldSwing2.java
	319_01_Swing/src/coms319/lab1/HelloWorldSwing3.java
	319_02_Swing/.project
	319_04_ExamplesSimple/.project
	319_05_ExamplesIntermediate/.project
	319_HelloWorldSwing/.classpath
	319_HelloWorldSwing/.project
	319_HelloWorldSwing/.settings/org.eclipse.jdt.core.prefs
	319_HelloWorldSwing/.settings/org.eclipse.jdt.ui.prefs
	319_HelloWorldSwing/forms-1.3.0-src.zip
	319_HelloWorldSwing/forms-1.3.0.jar
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing.java
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing2.java
	319_HelloWorldSwing/src/coms319/lab1/HelloWorldSwing3.java
	319_Lab01/.classpath
	319_Lab01/.project
	319_Lab01/.settings/org.eclipse.jdt.core.prefs
	319_Lab01/.settings/org.eclipse.jdt.ui.prefs
	319_Lab01/forms-1.3.0-src.zip
	319_Lab01/forms-1.3.0.jar
	319_Lab01/src/coms319/lab1/HelloWorldSwing.java
	319_Lab01/src/coms319/lab1/HelloWorldSwing2.java
	319_Lab01/src/coms319/lab1/HelloWorldSwing3.java