Tasha

merging in changes to html and scss