Merge branch 'dev'

2012-03-01 12:14:40 -05:00
parent e1c6a50b8f d88750a5e4
commit 1545921040
1 changed files with 2 additions and 2 deletions
--- a/test/src/com/test/Main.java
+++ b/test/src/com/test/Main.java
@@ -26,8 +26,8 @@ public class Main {
 	 * @author ricky barrette
 	 */
 	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
+		System.out.print("this is a test");
+		System.out.print("MORE OUTPUT!!!");
 	}

 }