Added scss files from master, also deleted html shiv