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