Merge branch 'master' of

https://gitlab.cas.mcmaster.ca/schankuc/2XB3.git

Conflicts:
	src/HelloWorld.java

.gitignore

@@ -5,4 +5,4 @@
 *.aux
 *.bbl
 *.blg
-
+*DS_STORE*

src/HelloWorld.java

 
 public class HelloWorld {
-	public static void main(String[] args) {
-		System.out.println("Hello World! Push Test");
+	public static void main(String[] args) {
+		System.out.println("Hello World! Push Test");
 	}
 }