this is a test made in class
Merge branch 'master' of github.com:modamod/my-javas