Adding bear class
Merge branch 'JonsBranch'
Merge branch 'master' into JonsBranch