Add method
Merge branch 'devbranch'
Add my class
Merge branch 'master'