Added another branch and class
Merge branch 'scarybranch'