Assignment Completed - with updated colour scheme

Also made some cleanup of the scss files