Merge branch 'testing' into development

Conflicts:
	test/src/com/test/Main.java

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>

test/src/com/test/Main.java

@@ -17,6 +17,7 @@ public class Main {
 	 * @author ricky barrette
 	 */
 	public Main() {
+		System.out.print("this is a test");
 		System.out.println("this is a test");
 		System.out.println("MORE OUTPUT!!!");
 		System.out.println("EVEN MORE OUTPUT!!!");