Added TempClass
deleted main.java
Merge branch 'ultrabranch' into testspecialbranch
Modified MainClass.java
Added TempClass
Merge branch 'testNewFromTest' of https://github.com/Chucke1992/HelloWorld into testNewFromTest
added tasks folder
Modified MainClass.java
Modified MainClass
Modified NewClass.java
Added FileClass
Merge branch 'testspecialbranch' into testspecial
Merge branch 'testspecial' into testNewFromTest
Modififed FileClass.java
resolved conflict
Merge branch 'ultrabranch' into testspecialbranch
Merge branch 'testNewFromTest' into test1
Merge branch 'test1' of https://github.com/Chucke1992/HelloWorld into test1
resolved MainClass java issue
Merge branch 'testfromtest' into test1