added UltraClass to branch test
added new branch test1, class Test1File
Merge branch 'test1' into testfromtest
Updated MainClass
Modified MainClass.java
Added Simplet.java
Added Testclass
modified MainClass.java
Added line to MainClass
delete MainClass.java from test
added Main.java instead of deleted!
Added NewClass.java
Modified MainClass
added MainClass.java
Merging master & ultrabranch
Merge branch 'master' into testspecial