updating styles and things
adding pages for quiz
completing quiz merge