added MyClass
added myMethod to MyClass from repo
added myMethod1 from repo1
Merge branch 'master' of
https://github.com/pradoMaster/HelloWorldRepo.git

Conflicts:
	HelloWorld/src/MyClass.java
added myMethod2 from repo1
added myMethod3 from repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/MyClass.java
Merge branch 'master' of https://github.com/pradoMaster/HelloWorldRepo.git into pedjaAgain