added my class
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
trollmerge
Merge remote-tracking branch 'origin/master'
merge
Merge remote-tracking branch 'origin/master'
trollmerge