Added shopscripts
merged style and content.scss