Finishes baggege class
Merge branch 'master' into inClass