CSP1150 A1: moved Demo class out of assignment package
Merge branch 'rewrite'