Removed demo2, created demo-clean, combined createGrid and drawColourGrid into generateColorGrid